Merge branch '3.2.x'
Closes gh-39845
This commit is contained in:
commit
736f712ba9
@ -1,5 +1,5 @@
|
||||
ARG DOCKER_PROXY_CACHE=
|
||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240212
|
||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
|
||||
|
||||
ADD setup.sh /setup.sh
|
||||
ADD get-jdk-url.sh /get-jdk-url.sh
|
||||
|
@ -1,5 +1,5 @@
|
||||
ARG DOCKER_PROXY_CACHE=
|
||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240212
|
||||
FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240227
|
||||
|
||||
ADD setup.sh /setup.sh
|
||||
ADD get-jdk-url.sh /get-jdk-url.sh
|
||||
|
@ -1,10 +1,10 @@
|
||||
FROM ubuntu:jammy-20240212 as prepare
|
||||
FROM ubuntu:jammy-20240227 as prepare
|
||||
COPY downloads/* /opt/download/
|
||||
RUN mkdir -p /opt/jdk && \
|
||||
cd /opt/jdk && \
|
||||
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
|
||||
COPY --from=prepare /opt/jdk /opt/jdk
|
||||
ENV JAVA_HOME /opt/jdk
|
@ -1,10 +1,10 @@
|
||||
FROM ubuntu:jammy-20240212 as prepare
|
||||
FROM ubuntu:jammy-20240227 as prepare
|
||||
COPY downloads/* /opt/download/
|
||||
RUN mkdir -p /opt/jdk && \
|
||||
cd /opt/jdk && \
|
||||
tar xzf /opt/download/* --strip-components=1
|
||||
|
||||
FROM ubuntu:jammy-20240212
|
||||
FROM ubuntu:jammy-20240227
|
||||
COPY --from=prepare /opt/jdk /opt/jdk
|
||||
ENV JAVA_HOME /opt/jdk
|
||||
ENV PATH $JAVA_HOME/bin:$PATH
|
||||
|
Loading…
x
Reference in New Issue
Block a user