From 1a4e2c6ed4e8e30e06c2caadaa930334f74490ab Mon Sep 17 00:00:00 2001 From: ClementBouvierN Date: Fri, 21 Feb 2025 14:52:54 +0100 Subject: [PATCH] Migration to java 21 (#7896) Signed-off-by: ClementBouvierN --- bin/load_environment_light.sh | 4 ++-- services/businessconfig/Dockerfile | 2 +- services/cards-consultation/Dockerfile | 2 +- services/cards-publication/Dockerfile | 2 +- services/external-devices/Dockerfile | 2 +- services/users/Dockerfile | 2 +- src/test/dummyModbusDevice/Dockerfile | 2 +- src/test/externalApp/Dockerfile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/load_environment_light.sh b/bin/load_environment_light.sh index 00ed6e966b..100bcb4e91 100755 --- a/bin/load_environment_light.sh +++ b/bin/load_environment_light.sh @@ -11,8 +11,8 @@ source ${BASH_SOURCE%/*}/load_variables.sh -sdk install java 17.0.14-zulu -sdk use java 17.0.14-zulu +sdk install java 21.0.6-zulu +sdk use java 21.0.6-zulu nvm install v22.13.1 nvm use v22.13.1 echo "Install opfab-cli" diff --git a/services/businessconfig/Dockerfile b/services/businessconfig/Dockerfile index 0e0ae4d692..a7913a98b1 100644 --- a/services/businessconfig/Dockerfile +++ b/services/businessconfig/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE RUN apk --no-cache add bash diff --git a/services/cards-consultation/Dockerfile b/services/cards-consultation/Dockerfile index 7e84e19bcb..5c0f23289c 100644 --- a/services/cards-consultation/Dockerfile +++ b/services/cards-consultation/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE RUN apk --no-cache add bash diff --git a/services/cards-publication/Dockerfile b/services/cards-publication/Dockerfile index b98a0312ea..340bc3339f 100644 --- a/services/cards-publication/Dockerfile +++ b/services/cards-publication/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE RUN apk --no-cache add bash diff --git a/services/external-devices/Dockerfile b/services/external-devices/Dockerfile index b1aa72ff7b..8ed29b0b0b 100644 --- a/services/external-devices/Dockerfile +++ b/services/external-devices/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE RUN apk --no-cache add bash diff --git a/services/users/Dockerfile b/services/users/Dockerfile index 57aee39043..1223d04ba4 100644 --- a/services/users/Dockerfile +++ b/services/users/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE RUN apk --no-cache add bash diff --git a/src/test/dummyModbusDevice/Dockerfile b/src/test/dummyModbusDevice/Dockerfile index b88facc0ec..63c817fa47 100644 --- a/src/test/dummyModbusDevice/Dockerfile +++ b/src/test/dummyModbusDevice/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp ARG JAR_FILE COPY build/libs/${JAR_FILE} app.jar diff --git a/src/test/externalApp/Dockerfile b/src/test/externalApp/Dockerfile index b24ccd9d1d..773fa67e3b 100644 --- a/src/test/externalApp/Dockerfile +++ b/src/test/externalApp/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk-alpine:17.0.14-jre@sha256:887ed804e57455c5a1143bda2e0bbed423a56d0a7d30d231f25b4c838464dc6a +FROM azul/zulu-openjdk-alpine:21.0.6-jre@sha256:cf24bfe32cb1b34d20d7cd256e9aaae677b576612c4cf293938980dfc1c4a3c1 VOLUME /tmp RUN env ARG JAR_FILE