From 2db2c1703096cb785d50e746fddda3d6fbd9c8f5 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 14:20:36 -0600 Subject: [PATCH 1/3] chore(upgrades): Update OS to latest supported releases --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 73ece904e..649da5e69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,3 +4,4 @@ spinnakerGradleVersion=8.32.1 targetJava17=true org.gradle.jvmargs=-Xmx2g +targetJava17=true From 81584d62417dc8524372d8d86c9ea58727343a61 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 14:19:36 -0600 Subject: [PATCH 2/3] chore(upgrades): Update OS to latest supported releases --- Dockerfile | 2 +- Dockerfile.compile | 2 +- Dockerfile.slim | 2 +- Dockerfile.ubuntu | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d089c2ae6..b97364354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN tar -xf /tmp/workdir/kayenta-web/build/distributions/kayenta.tar -C /opt # # Release Image # -FROM alpine:3.16 +FROM alpine:3.20 LABEL maintainer="delivery-engineering@netflix.com" diff --git a/Dockerfile.compile b/Dockerfile.compile index 8a73bf22b..57f3af092 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.20 RUN apk add --update \ openjdk17 \ && rm -rf /var/cache/apk diff --git a/Dockerfile.slim b/Dockerfile.slim index 40c0585ce..21b71b7d2 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.20 LABEL maintainer="sig-platform@spinnaker.io" RUN apk --no-cache add --update bash curl openjdk17-jre RUN addgroup -S -g 10111 spinnaker diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 50ee57a93..6a4555672 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="sig-platform@spinnaker.io" RUN apt-get update && apt-get -y install curl openjdk-17-jre-headless wget RUN adduser --system --uid 10111 --group spinnaker From 083f25aa2af5f01b9354a149a9192c2ecf431a50 Mon Sep 17 00:00:00 2001 From: Jason McIntosh Date: Tue, 19 Nov 2024 14:21:20 -0600 Subject: [PATCH 3/3] chore(upgrades): Update OS to latest supported releases --- gradle.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 649da5e69..ff4798f82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,3 @@ org.gradle.parallel=true spinnakerGradleVersion=8.32.1 targetJava17=true org.gradle.jvmargs=-Xmx2g - -targetJava17=true