Skip to content

Commit b92e23f

Browse files
authored
Merge pull request #327 from keeganwitt/java-24
Replace Java 23 with 24 (closes #326)
2 parents dddab4a + ab0419f commit b92e23f

13 files changed

Lines changed: 62 additions & 55 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,22 @@ jobs:
4747
- jdk21-ubi9
4848
- jdk21-jammy-graal
4949
- jdk21-noble-graal
50-
- jdk23-noble
51-
- jdk23-alpine
52-
- jdk23-corretto
53-
- jdk23-ubi9
54-
- jdk23-noble-graal
50+
- jdk24-noble
51+
- jdk24-alpine
52+
- jdk24-corretto
53+
- jdk24-ubi9
54+
- jdk24-noble-graal
5555
- jdk-lts-and-current
5656
- jdk-lts-and-current-alpine
5757
- jdk-lts-and-current-corretto
5858
- jdk-lts-and-current-graal
59+
exclude:
60+
# Gradle doesn't yet support Java 24
61+
- directory: jdk24-noble
62+
- directory: jdk24-noble-graal
63+
- directory: jdk24-corretto
64+
- directory: jdk24-alpine
65+
- directory: jdk24-ubi9
5966
steps:
6067
- name: checkout
6168
uses: actions/checkout@v4

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
* [jdk21-corretto, corretto](https://github.com/keeganwitt/docker-gradle/blob/master/jdk21-corretto/Dockerfile)
2424
* [jdk21-noble-graal, jdk21-graal, graal](https://github.com/keeganwitt/docker-gradle/blob/master/jdk21-noble-graal/Dockerfile)
2525
* [jdk21-jammy-graal](https://github.com/keeganwitt/docker-gradle/blob/master/jdk21-jammy-graal/Dockerfile)
26-
* [jdk23, jdk23-noble](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23/Dockerfile)
27-
* [jdk23-alpine](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-alpine/Dockerfile)
28-
* [jdk23-corretto](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-corretto/Dockerfile)
29-
* [jdk23-noble-graal, jdk23-graal](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-noble-graal/Dockerfile)
26+
* [jdk24, jdk24-noble](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23/Dockerfile)
27+
* [jdk24-alpine](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-alpine/Dockerfile)
28+
* [jdk24-corretto](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-corretto/Dockerfile)
29+
* [jdk24-noble-graal, jdk24-graal](https://github.com/keeganwitt/docker-gradle/blob/master/jdk23-noble-graal/Dockerfile)
3030
* [jdk-lts-and-current](https://github.com/keeganwitt/docker-gradle/blob/master/jdk-lts-and-current/Dockerfile)
3131
* [jdk-lts-and-current-alpine](https://github.com/keeganwitt/docker-gradle/blob/master/jdk-lts-and-current-alpine/Dockerfile)
3232
* [jdk-lts-and-current-graal](https://github.com/keeganwitt/docker-gradle/blob/master/jdk-lts-and-current-graal/Dockerfile)

jdk-lts-and-current-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
FROM eclipse-temurin:21-jdk-alpine
22

3-
COPY --from=eclipse-temurin:23-jdk-alpine /opt/java/openjdk /opt/java/openjdk23
3+
COPY --from=eclipse-temurin:24-jdk-alpine /opt/java/openjdk /opt/java/openjdk24
44
RUN set -o errexit -o nounset \
55
&& ln -s /opt/java/openjdk /opt/java/openjdk21
6-
ENV JAVA_CURRENT_HOME=/opt/java/openjdk23
6+
ENV JAVA_CURRENT_HOME=/opt/java/openjdk24
77
ENV JAVA_LTS_HOME=/opt/java/openjdk21
88

99
CMD ["gradle"]

jdk-lts-and-current-corretto/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM amazoncorretto:21-al2023-jdk
22

3-
COPY --from=amazoncorretto:23-al2023-jdk /usr/lib/jvm/java-23-amazon-corretto /usr/lib/jvm/java-23-amazon-corretto
3+
COPY --from=amazoncorretto:24-al2023-jdk /usr/lib/jvm/java-24-amazon-corretto /usr/lib/jvm/java-24-amazon-corretto
44
ENV JAVA_LTS_HOME=/usr/lib/jvm/java-21-amazon-corretto
5-
ENV JAVA_CURRENT_HOME=/usr/lib/jvm/java-23-amazon-corretto
5+
ENV JAVA_CURRENT_HOME=/usr/lib/jvm/java-24-amazon-corretto
66

77
CMD ["gradle"]
88

jdk-lts-and-current-graal/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -o errexit -o nounset \
6262

6363
ENV JAVA_HOME=/opt/java/graalvm
6464
ENV JAVA_LTS_HOME=/opt/java/graalvm21
65-
ENV JAVA_CURRENT_HOME=/opt/java/graalvm23
65+
ENV JAVA_CURRENT_HOME=/opt/java/graalvm24
6666
RUN set -o errexit -o nounset \
6767
&& mkdir /opt/java \
6868
\
@@ -87,24 +87,24 @@ RUN set -o errexit -o nounset \
8787
&& mv graalvm-* /opt/java/graalvm21 \
8888
\
8989
&& echo "Downloading current GraalVM" \
90-
&& JAVA_23_VERSION=23.0.2 \
91-
&& GRAALVM_23_AMD64_DOWNLOAD_SHA256=0cf63e88153b759136947c14f0042c515ae1ff9abf346f143dc47af065b1d6dd \
92-
&& GRAALVM_23_AARCH64_DOWNLOAD_SHA256=70d0ee8cb1922fbfe5a5db6a93360f63bbf0bdf72a6ca1f9b00906e600628c19 \
90+
&& JAVA_24_VERSION=24.0.0 \
91+
&& GRAALVM_24_AMD64_DOWNLOAD_SHA256=6476257f3e8e652860c9dfcfea213961ec88a74d7025299d3e95b9441ee5213a \
92+
&& GRAALVM_24_AARCH64_DOWNLOAD_SHA256=d19c49df72b0d5017bed0467a7053baff3ee83cdff93a4341b3910fab45c68a4 \
9393
&& ARCHITECTURE=$(dpkg --print-architecture) \
9494
&& if [ "${ARCHITECTURE}" = "amd64" ]; then GRAALVM_ARCHITECTURE=linux-x64; fi \
9595
&& if [ "${ARCHITECTURE}" = "arm64" ]; then GRAALVM_ARCHITECTURE=linux-aarch64; fi \
96-
&& GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JAVA_23_VERSION}/graalvm-community-jdk-${JAVA_23_VERSION}_${GRAALVM_ARCHITECTURE}_bin.tar.gz \
96+
&& GRAALVM_PKG=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${JAVA_24_VERSION}/graalvm-community-jdk-${JAVA_24_VERSION}_${GRAALVM_ARCHITECTURE}_bin.tar.gz \
9797
&& wget --no-verbose --output-document=graalvm.tar.gz "${GRAALVM_PKG}" \
9898
\
9999
&& echo "Checking current GraalVM download hash" \
100-
&& if [ "${ARCHITECTURE}" = "amd64" ]; then GRAALVM_DOWNLOAD_SHA256="${GRAALVM_23_AMD64_DOWNLOAD_SHA256}"; fi \
101-
&& if [ "${ARCHITECTURE}" = "arm64" ]; then GRAALVM_DOWNLOAD_SHA256="${GRAALVM_23_AARCH64_DOWNLOAD_SHA256}"; fi \
100+
&& if [ "${ARCHITECTURE}" = "amd64" ]; then GRAALVM_DOWNLOAD_SHA256="${GRAALVM_24_AMD64_DOWNLOAD_SHA256}"; fi \
101+
&& if [ "${ARCHITECTURE}" = "arm64" ]; then GRAALVM_DOWNLOAD_SHA256="${GRAALVM_24_AARCH64_DOWNLOAD_SHA256}"; fi \
102102
&& echo "${GRAALVM_DOWNLOAD_SHA256} *graalvm.tar.gz" | sha256sum --check - \
103103
\
104104
&& echo "Installing current GraalVM" \
105105
&& tar --extract --gunzip --file graalvm.tar.gz \
106106
&& rm graalvm.tar.gz \
107-
&& mv graalvm-* /opt/java/graalvm23 \
107+
&& mv graalvm-* /opt/java/graalvm24 \
108108
\
109109
&& echo "Default Java to LTS GraalVM" \
110110
&& ln --symbolic /opt/java/graalvm21 /opt/java/graalvm \

jdk-lts-and-current/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM eclipse-temurin:21-jdk-noble
22

3-
COPY --from=eclipse-temurin:23-jdk-noble /opt/java/openjdk /opt/java/openjdk23
3+
COPY --from=eclipse-temurin:24-jdk-noble /opt/java/openjdk /opt/java/openjdk24
44
RUN set -o errexit -o nounset \
55
&& ln --symbolic /opt/java/openjdk /opt/java/openjdk21
66
ENV JAVA_LTS_HOME=/opt/java/openjdk21
7-
ENV JAVA_CURRENT_HOME=/opt/java/openjdk23
7+
ENV JAVA_CURRENT_HOME=/opt/java/openjdk24
88

99
CMD ["gradle"]
1010

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:23-jdk-alpine
1+
FROM eclipse-temurin:24-jdk-alpine
22

33
CMD ["gradle"]
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM amazoncorretto:23-al2023-jdk
1+
FROM amazoncorretto:24-al2023-jdk
22

33
CMD ["gradle"]
44

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ RUN set -o errexit -o nounset \
5656
&& which svn
5757

5858
ENV JAVA_HOME=/opt/java/graalvm
59-
ENV JAVA_VERSION=23.0.2
59+
ENV JAVA_VERSION=24.0.0
6060
RUN set -o errexit -o nounset \
6161
&& mkdir /opt/java \
6262
\
6363
&& echo "Downloading GraalVM" \
64-
&& GRAALVM_AMD64_DOWNLOAD_SHA256=0cf63e88153b759136947c14f0042c515ae1ff9abf346f143dc47af065b1d6dd \
65-
&& GRAALVM_AARCH64_DOWNLOAD_SHA256=70d0ee8cb1922fbfe5a5db6a93360f63bbf0bdf72a6ca1f9b00906e600628c19 \
64+
&& GRAALVM_AMD64_DOWNLOAD_SHA256=6476257f3e8e652860c9dfcfea213961ec88a74d7025299d3e95b9441ee5213a \
65+
&& GRAALVM_AARCH64_DOWNLOAD_SHA256=d19c49df72b0d5017bed0467a7053baff3ee83cdff93a4341b3910fab45c68a4 \
6666
&& ARCHITECTURE=$(dpkg --print-architecture) \
6767
&& if [ "${ARCHITECTURE}" = "amd64" ]; then GRAALVM_ARCHITECTURE=linux-x64; fi \
6868
&& if [ "${ARCHITECTURE}" = "arm64" ]; then GRAALVM_ARCHITECTURE=linux-aarch64; fi \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:23-jdk-noble
1+
FROM eclipse-temurin:24-jdk-noble
22

33
CMD ["gradle"]
44

0 commit comments

Comments
 (0)