mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '3.1.x' into 3.2.x
Closes gh-39433
This commit is contained in:
commit
7b34a44f4d
@ -1,5 +1,5 @@
|
|||||||
ARG DOCKER_PROXY_CACHE=
|
ARG DOCKER_PROXY_CACHE=
|
||||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111
|
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240125
|
||||||
|
|
||||||
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
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
ARG DOCKER_PROXY_CACHE=
|
ARG DOCKER_PROXY_CACHE=
|
||||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111
|
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240125
|
||||||
|
|
||||||
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
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
FROM ubuntu:jammy-20240111 as prepare
|
FROM ubuntu:jammy-20240125 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-20240111
|
FROM ubuntu:jammy-20240125
|
||||||
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
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
FROM ubuntu:jammy-20240111 as prepare
|
FROM ubuntu:jammy-20240125 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-20240111
|
FROM ubuntu:jammy-20240125
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user