From d616568324f85fda58cb8dca1355ea0f62b14257 Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 7 Feb 2024 15:43:35 -0600 Subject: [PATCH] Upgrade CI images to ubuntu:jammy-20240125 Closes gh-39426 --- ci/images/ci-image-jdk21/Dockerfile | 2 +- ci/images/ci-image/Dockerfile | 2 +- .../intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile | 4 ++-- .../src/intTest/resources/conf/oracle-jdk-17/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile index c13dea362bf..777a94f0a73 100644 --- a/ci/images/ci-image-jdk21/Dockerfile +++ b/ci/images/ci-image-jdk21/Dockerfile @@ -1,5 +1,5 @@ ARG DOCKER_PROXY_CACHE= -FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111 +FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240125 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index f660b06a042..581c18b9de0 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,5 +1,5 @@ ARG DOCKER_PROXY_CACHE= -FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111 +FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240125 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile index 0f7782c811f..3ed174cd260 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20240111 as prepare +FROM ubuntu:jammy-20240125 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20240111 +FROM ubuntu:jammy-20240125 RUN apt-get update && apt-get install -y software-properties-common curl COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile index f27488f00f8..2141eaa09fd 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:jammy-20240111 as prepare +FROM ubuntu:jammy-20240125 as prepare COPY downloads/* /opt/download/ RUN mkdir -p /opt/jdk && \ cd /opt/jdk && \ tar xzf /opt/download/* --strip-components=1 -FROM ubuntu:jammy-20240111 +FROM ubuntu:jammy-20240125 COPY --from=prepare /opt/jdk /opt/jdk ENV JAVA_HOME /opt/jdk ENV PATH $JAVA_HOME/bin:$PATH