diff --git a/Dockerfile.compile b/Dockerfile.compile index 5609ffa51..f47e1a778 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,9 +1,9 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="sig-platform@spinnaker.io" RUN echo "mysql-server mysql-server/root_password password sa" | debconf-set-selections RUN echo "mysql-server mysql-server/root_password_again password sa" | debconf-set-selections RUN apt-get update && apt-get install -y \ - openjdk-11-jdk \ + openjdk-17-jdk \ mysql-server \ && rm -rf /var/lib/apt/lists/* ENV GRADLE_USER_HOME /workspace/.gradle diff --git a/Dockerfile.slim b/Dockerfile.slim index 0e2429c98..3f1e011c2 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,6 +1,6 @@ -FROM alpine:3.11 +FROM alpine:3.20 LABEL maintainer="sig-platform@spinnaker.io" -RUN apk --no-cache add --update bash openjdk11-jre +RUN apk --no-cache add --update bash openjdk17-jre RUN addgroup -S -g 10111 spinnaker RUN adduser -S -G spinnaker -u 10111 spinnaker COPY keel-web/build/install/keel /opt/keel diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 4a492faf9..6d5f3cc61 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,6 +1,6 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="sig-platform@spinnaker.io" -RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget +RUN apt-get update && apt-get -y install openjdk-17-jre-headless wget RUN adduser --system --uid 10111 --group spinnaker COPY keel-web/build/install/keel /opt/keel RUN mkdir -p /opt/keel/plugins && chown -R spinnaker:nogroup /opt/keel/plugins diff --git a/gradle.properties b/gradle.properties index 275ab4183..12e961f2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +targetJava17=true kotlinVersion=1.6.21 fiatVersion=1.50.0 korkVersion=7.243.0 diff --git a/keel-sql/src/test/resources/testcontainers.properties b/keel-sql/src/test/resources/testcontainers.properties index 5ecaa452e..06137e2be 100644 --- a/keel-sql/src/test/resources/testcontainers.properties +++ b/keel-sql/src/test/resources/testcontainers.properties @@ -1 +1 @@ -ryuk.container.image = public.ecr.aws/s4w6t4b6/testcontainers/ryuk:0.3.4 +ryuk.container.image = testcontainers/ryuk:0.11.0