GitHub-Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-05-02 19:30:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-40412
This commit is contained in:
Scott Frederick
2024-04-17 16:40:21 -05:00
parent 93400cbe2a bc5777d0cc
commit 0724014645
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/images/ci-image-jdk21/Dockerfile
+1 -1
View File
@@ -1,5 +1,5 @@
ARG DOCKER_PROXY_CACHE=
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240405
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
ci/images/ci-image/Dockerfile
+1 -1
View File
@@ -1,5 +1,5 @@
ARG DOCKER_PROXY_CACHE=
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240405
ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/resources/conf/Ubuntu/jammy-20240227/Dockerfile
+2 -2
View File
@@ -1,10 +1,10 @@
FROM ubuntu:jammy-20240227 as prepare
FROM ubuntu:jammy-20240405 as prepare
COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1
FROM ubuntu:jammy-20240227
FROM ubuntu:jammy-20240405
RUN apt-get update && apt-get install -y software-properties-common curl
COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/resources/conf/oracle-jdk-17/Dockerfile
+2 -2
View File
@@ -1,10 +1,10 @@
FROM ubuntu:jammy-20240227 as prepare
FROM ubuntu:jammy-20240405 as prepare
COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1
FROM ubuntu:jammy-20240227
FROM ubuntu:jammy-20240405
COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk
ENV PATH $JAVA_HOME/bin:$PATH