Skip to content

Commit

Permalink
Merge branch '3.1.x'
Browse files Browse the repository at this point in the history
Closes gh-38893
  • Loading branch information
philwebb committed Dec 21, 2023
2 parents f31ffbf + 66e9c77 commit 3222458
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ci/images/ci-image-jdk21/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20231128
FROM ubuntu:jammy-20231211.1

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,4 +1,4 @@
FROM ubuntu:jammy-20231128
FROM ubuntu:jammy-20231211.1

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-20231004 as prepare
FROM ubuntu:jammy-20231211.1 as prepare
COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1

FROM ubuntu:jammy-20231004
FROM ubuntu:jammy-20231211.1
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,4 +1,4 @@
FROM ubuntu:jammy-20230624
FROM ubuntu:jammy-20231211.1
RUN apt-get update && \
apt-get install -y software-properties-common curl && \
mkdir -p /opt/oraclejdk && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20230624
FROM ubuntu:jammy-20231211.1
RUN apt-get update && \
apt-get install -y software-properties-common curl && \
mkdir -p /opt/oraclejdk && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ubuntu:jammy-20231004 as prepare
FROM ubuntu:jammy-20231211.1 as prepare
COPY downloads/* /opt/download/
RUN mkdir -p /opt/jdk && \
cd /opt/jdk && \
tar xzf /opt/download/* --strip-components=1

FROM ubuntu:jammy-20231004
FROM ubuntu:jammy-20231211.1
COPY --from=prepare /opt/jdk /opt/jdk
ENV JAVA_HOME /opt/jdk
ENV PATH $JAVA_HOME/bin:$PATH

0 comments on commit 3222458

Please sign in to comment.