Skip to content

Commit

Permalink
Upgrade CI images to ubuntu:jammy-20240227
Browse files Browse the repository at this point in the history
Closes gh-39844
  • Loading branch information
scottfrederick committed Mar 13, 2024
1 parent db3d282 commit c83f701
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/images/ci-image-jdk21/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/images/ci-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit c83f701

Please sign in to comment.