fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-39845
This commit is contained in:
Scott Frederick 2024-03-13 15:21:24 -05:00
commit 736f712ba9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/images/ci-image-jdk21/Dockerfile
View File

@ -1,5 +1,5 @@
ARG DOCKER_PROXY_CACHE= ARG DOCKER_PROXY_CACHE=
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240212 FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh

2
ci/images/ci-image/Dockerfile
View File

@ -1,5 +1,5 @@
ARG DOCKER_PROXY_CACHE= ARG DOCKER_PROXY_CACHE=
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240212 FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240111/Dockerfile → spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile
View File

@ -1,10 +1,10 @@
FROM ubuntu:jammy-20240212 as prepare FROM ubuntu:jammy-20240227 as prepare
COPY downloads/* /opt/download/ COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \ RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \ cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1 tar xzf /opt/download/* --strip-components=1
FROM ubuntu:jammy-20240212 FROM ubuntu:jammy-20240227
RUN apt-get update && apt-get install -y software-properties-common curl RUN apt-get update && apt-get install -y software-properties-common curl
COPY --from=prepare /opt/jdk /opt/jdk COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk ENV JAVA_HOME /opt/jdk

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
View File

@ -1,10 +1,10 @@
FROM ubuntu:jammy-20240212 as prepare FROM ubuntu:jammy-20240227 as prepare
COPY downloads/* /opt/download/ COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \ RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \ cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1 tar xzf /opt/download/* --strip-components=1
FROM ubuntu:jammy-20240212 FROM ubuntu:jammy-20240227
COPY --from=prepare /opt/jdk /opt/jdk COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk ENV JAVA_HOME /opt/jdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH