diff --git a/28/bookworm/Dockerfile b/28/bookworm/Dockerfile index 3b10bfca..dbd70051 100644 --- a/28/bookworm/Dockerfile +++ b/28/bookworm/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/oraclelinux10/Dockerfile b/28/oraclelinux10/Dockerfile index 9a918e5c..eedf03e2 100644 --- a/28/oraclelinux10/Dockerfile +++ b/28/oraclelinux10/Dockerfile @@ -17,6 +17,10 @@ RUN set -eux; \ # java.lang.UnsatisfiedLinkError: /usr/java/openjdk-12/lib/libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077 freetype fontconfig \ +# java.lang.RuntimeException: Fontconfig head is null, check your fonts or fonts configuration +# OL10 only has variable fonts by default, and the JDK skips those for the primary font slot (as of 28-ea+24) +# https://github.com/openjdk/jdk/commit/c678ea9b0a412f9a435e9f6f84402c0479645f3c (JDK-8396849) + dejavu-sans-fonts \ ; \ microdnf clean all @@ -30,19 +34,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/oraclelinux9/Dockerfile b/28/oraclelinux9/Dockerfile index 75597a57..02354cba 100644 --- a/28/oraclelinux9/Dockerfile +++ b/28/oraclelinux9/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/slim-bookworm/Dockerfile b/28/slim-bookworm/Dockerfile index 85b54641..7888b8aa 100644 --- a/28/slim-bookworm/Dockerfile +++ b/28/slim-bookworm/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/slim-trixie/Dockerfile b/28/slim-trixie/Dockerfile index 37fd84ba..07f639a6 100644 --- a/28/slim-trixie/Dockerfile +++ b/28/slim-trixie/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/trixie/Dockerfile b/28/trixie/Dockerfile index 3e70fbfa..92226cb9 100644 --- a/28/trixie/Dockerfile +++ b/28/trixie/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz'; \ - downloadSha256='8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz'; \ + downloadSha256='5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz'; \ - downloadSha256='b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf'; \ + downloadUrl='https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz'; \ + downloadSha256='f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/28/windows/nanoserver-ltsc2022/Dockerfile b/28/windows/nanoserver-ltsc2022/Dockerfile index 7fc6e80e..dbf41a96 100644 --- a/28/windows/nanoserver-ltsc2022/Dockerfile +++ b/28/windows/nanoserver-ltsc2022/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 -COPY --from=openjdk:28-ea-23-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:28-ea-24-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/28/windows/nanoserver-ltsc2025/Dockerfile b/28/windows/nanoserver-ltsc2025/Dockerfile index d296ca18..63a287cb 100644 --- a/28/windows/nanoserver-ltsc2025/Dockerfile +++ b/28/windows/nanoserver-ltsc2025/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 +ENV JAVA_VERSION 28-ea+24 -COPY --from=openjdk:28-ea-23-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:28-ea-24-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/28/windows/windowsservercore-ltsc2022/Dockerfile b/28/windows/windowsservercore-ltsc2022/Dockerfile index e43c6ced..43917565 100644 --- a/28/windows/windowsservercore-ltsc2022/Dockerfile +++ b/28/windows/windowsservercore-ltsc2022/Dockerfile @@ -33,9 +33,9 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 -ENV JAVA_URL https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_windows-x64_bin.zip -ENV JAVA_SHA256 14c3fc0511b3d83dc2b23875f3755241cd1eb1c6ee594ce0a2e80e12be76873f +ENV JAVA_VERSION 28-ea+24 +ENV JAVA_URL https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_windows-x64_bin.zip +ENV JAVA_SHA256 32b5425d4d159bde96e9c07d7675d4a63f5dc71303ded3b0e6289b6c656452b6 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/28/windows/windowsservercore-ltsc2025/Dockerfile b/28/windows/windowsservercore-ltsc2025/Dockerfile index 72022516..103fc112 100644 --- a/28/windows/windowsservercore-ltsc2025/Dockerfile +++ b/28/windows/windowsservercore-ltsc2025/Dockerfile @@ -33,9 +33,9 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 28-ea+23 -ENV JAVA_URL https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_windows-x64_bin.zip -ENV JAVA_SHA256 14c3fc0511b3d83dc2b23875f3755241cd1eb1c6ee594ce0a2e80e12be76873f +ENV JAVA_VERSION 28-ea+24 +ENV JAVA_URL https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_windows-x64_bin.zip +ENV JAVA_SHA256 32b5425d4d159bde96e9c07d7675d4a63f5dc71303ded3b0e6289b6c656452b6 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 83df4db5..80ea73d8 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -27,6 +27,12 @@ RUN set -eux; \ # java.lang.UnsatisfiedLinkError: /usr/java/openjdk-12/lib/libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077 freetype fontconfig \ +{{ if (oracle_version | tonumber) >= 10 then ( -}} +# java.lang.RuntimeException: Fontconfig head is null, check your fonts or fonts configuration +# OL10 only has variable fonts by default, and the JDK skips those for the primary font slot (as of 28-ea+24) +# https://github.com/openjdk/jdk/commit/c678ea9b0a412f9a435e9f6f84402c0479645f3c (JDK-8396849) + dejavu-sans-fonts \ +{{ ) else "" end -}} ; \ microdnf clean all diff --git a/versions.json b/versions.json index 06c4bc77..62150d94 100644 --- a/versions.json +++ b/versions.json @@ -1,18 +1,18 @@ { "28": { - "version": "28-ea+23", + "version": "28-ea+24", "arches": { "amd64": { - "url": "https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-x64_bin.tar.gz", - "sha256": "8a8723ee41ada67f996bbe8292fac4e2865803017832ca4a677c80dc13a97eb7" + "url": "https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-x64_bin.tar.gz", + "sha256": "5a03a3c06fcc4545132b530df7c81bc7828cf808eb34156b882240ae98d343e1" }, "arm64v8": { - "url": "https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_linux-aarch64_bin.tar.gz", - "sha256": "b739d2c42e55eaec14e7cf2efb861d165be04b680a61a0dba38878f20673a7cf" + "url": "https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_linux-aarch64_bin.tar.gz", + "sha256": "f68b14f12467ccf66f16b2d1300243be561f5b6da6c2e31effaf9db5d1c49af4" }, "windows-amd64": { - "url": "https://download.java.net/java/early_access/jdk28/23/GPL/openjdk-28-ea+23_windows-x64_bin.zip", - "sha256": "14c3fc0511b3d83dc2b23875f3755241cd1eb1c6ee594ce0a2e80e12be76873f" + "url": "https://download.java.net/java/early_access/jdk28/24/GPL/openjdk-28-ea+24_windows-x64_bin.zip", + "sha256": "32b5425d4d159bde96e9c07d7675d4a63f5dc71303ded3b0e6289b6c656452b6" } }, "variants": [