diff --git a/26/bookworm/Dockerfile b/26/bookworm/Dockerfile index ba40b2f2..e3df41b9 100644 --- a/26/bookworm/Dockerfile +++ b/26/bookworm/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/oraclelinux8/Dockerfile b/26/oraclelinux8/Dockerfile index 14771b7d..6fc97b74 100644 --- a/26/oraclelinux8/Dockerfile +++ b/26/oraclelinux8/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/oraclelinux9/Dockerfile b/26/oraclelinux9/Dockerfile index 1a9d0983..5770399d 100644 --- a/26/oraclelinux9/Dockerfile +++ b/26/oraclelinux9/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/slim-bookworm/Dockerfile b/26/slim-bookworm/Dockerfile index a664a26e..763c97df 100644 --- a/26/slim-bookworm/Dockerfile +++ b/26/slim-bookworm/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/slim-trixie/Dockerfile b/26/slim-trixie/Dockerfile index ab8b9a3e..794eaacd 100644 --- a/26/slim-trixie/Dockerfile +++ b/26/slim-trixie/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/trixie/Dockerfile b/26/trixie/Dockerfile index a13e0e6a..c76fa25e 100644 --- a/26/trixie/Dockerfile +++ b/26/trixie/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz'; \ - downloadSha256='9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz'; \ + downloadSha256='e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz'; \ - downloadSha256='f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e'; \ + downloadUrl='https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz'; \ + downloadSha256='aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/26/windows/nanoserver-ltsc2022/Dockerfile b/26/windows/nanoserver-ltsc2022/Dockerfile index 67156ce7..26e373aa 100644 --- a/26/windows/nanoserver-ltsc2022/Dockerfile +++ b/26/windows/nanoserver-ltsc2022/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 -COPY --from=openjdk:26-ea-33-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:26-rc-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/26/windows/nanoserver-ltsc2025/Dockerfile b/26/windows/nanoserver-ltsc2025/Dockerfile index f4fd0180..a4d3b0a8 100644 --- a/26/windows/nanoserver-ltsc2025/Dockerfile +++ b/26/windows/nanoserver-ltsc2025/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 26-ea+33 +ENV JAVA_VERSION 26 -COPY --from=openjdk:26-ea-33-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:26-rc-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/26/windows/windowsservercore-ltsc2022/Dockerfile b/26/windows/windowsservercore-ltsc2022/Dockerfile index a9efda10..6d11fff0 100644 --- a/26/windows/windowsservercore-ltsc2022/Dockerfile +++ b/26/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 26-ea+33 -ENV JAVA_URL https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_windows-x64_bin.zip -ENV JAVA_SHA256 1613acc47081355dcb54aca5db4a0cc088734861b42bd254657ab88fd50944ec +ENV JAVA_VERSION 26 +ENV JAVA_URL https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_windows-x64_bin.zip +ENV JAVA_SHA256 a2dc3240208c735fe8107f27641987dd1283ad7e896d9aabaccb363fd93673ff RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/26/windows/windowsservercore-ltsc2025/Dockerfile b/26/windows/windowsservercore-ltsc2025/Dockerfile index fc4b1139..d4a3f701 100644 --- a/26/windows/windowsservercore-ltsc2025/Dockerfile +++ b/26/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 26-ea+33 -ENV JAVA_URL https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_windows-x64_bin.zip -ENV JAVA_SHA256 1613acc47081355dcb54aca5db4a0cc088734861b42bd254657ab88fd50944ec +ENV JAVA_VERSION 26 +ENV JAVA_URL https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_windows-x64_bin.zip +ENV JAVA_SHA256 a2dc3240208c735fe8107f27641987dd1283ad7e896d9aabaccb363fd93673ff RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/27/bookworm/Dockerfile b/27/bookworm/Dockerfile index 21a5b8bb..a55709ac 100644 --- a/27/bookworm/Dockerfile +++ b/27/bookworm/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/oraclelinux8/Dockerfile b/27/oraclelinux8/Dockerfile index a91a0f92..1aa3ad91 100644 --- a/27/oraclelinux8/Dockerfile +++ b/27/oraclelinux8/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/oraclelinux9/Dockerfile b/27/oraclelinux9/Dockerfile index e7931fbf..4dfc4cd9 100644 --- a/27/oraclelinux9/Dockerfile +++ b/27/oraclelinux9/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ case "$arch" in \ 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/slim-bookworm/Dockerfile b/27/slim-bookworm/Dockerfile index d47a961c..d1d3bae1 100644 --- a/27/slim-bookworm/Dockerfile +++ b/27/slim-bookworm/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/slim-trixie/Dockerfile b/27/slim-trixie/Dockerfile index 89d9e851..e5ec07af 100644 --- a/27/slim-trixie/Dockerfile +++ b/27/slim-trixie/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/trixie/Dockerfile b/27/trixie/Dockerfile index 3291eb2e..2fd7d55e 100644 --- a/27/trixie/Dockerfile +++ b/27/trixie/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz'; \ - downloadSha256='951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz'; \ + downloadSha256='26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz'; \ - downloadSha256='3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7'; \ + downloadUrl='https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz'; \ + downloadSha256='7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/27/windows/nanoserver-ltsc2022/Dockerfile b/27/windows/nanoserver-ltsc2022/Dockerfile index 9a3ebe3f..fd4cfe0a 100644 --- a/27/windows/nanoserver-ltsc2022/Dockerfile +++ b/27/windows/nanoserver-ltsc2022/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 -COPY --from=openjdk:27-ea-7-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:27-ea-8-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/27/windows/nanoserver-ltsc2025/Dockerfile b/27/windows/nanoserver-ltsc2025/Dockerfile index 6add3276..02f3845a 100644 --- a/27/windows/nanoserver-ltsc2025/Dockerfile +++ b/27/windows/nanoserver-ltsc2025/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 27-ea+7 +ENV JAVA_VERSION 27-ea+8 -COPY --from=openjdk:27-ea-7-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:27-ea-8-windowsservercore-ltsc2025 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/27/windows/windowsservercore-ltsc2022/Dockerfile b/27/windows/windowsservercore-ltsc2022/Dockerfile index b03a6794..06e80c13 100644 --- a/27/windows/windowsservercore-ltsc2022/Dockerfile +++ b/27/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 27-ea+7 -ENV JAVA_URL https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_windows-x64_bin.zip -ENV JAVA_SHA256 5940fbffa36c927e8b186d5bcdaa99e332aebc16b642bb272e05e5cce059d4a3 +ENV JAVA_VERSION 27-ea+8 +ENV JAVA_URL https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_windows-x64_bin.zip +ENV JAVA_SHA256 d3ecddd6cae9d89198ec453bda26dd10c1e83e3bfcac8040a493acad08a14c6f RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/27/windows/windowsservercore-ltsc2025/Dockerfile b/27/windows/windowsservercore-ltsc2025/Dockerfile index 2c87cddf..b6173403 100644 --- a/27/windows/windowsservercore-ltsc2025/Dockerfile +++ b/27/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 27-ea+7 -ENV JAVA_URL https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_windows-x64_bin.zip -ENV JAVA_SHA256 5940fbffa36c927e8b186d5bcdaa99e332aebc16b642bb272e05e5cce059d4a3 +ENV JAVA_VERSION 27-ea+8 +ENV JAVA_URL https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_windows-x64_bin.zip +ENV JAVA_SHA256 d3ecddd6cae9d89198ec453bda26dd10c1e83e3bfcac8040a493acad08a14c6f RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/Dockerfile-windows.template b/Dockerfile-windows.template index a10ba7c9..f3cb26ae 100644 --- a/Dockerfile-windows.template +++ b/Dockerfile-windows.template @@ -1,13 +1,5 @@ {{ -def windows_variant: # "servercore", "nanoserver" - env.variant - | split("/")[-1] - | split("-")[0] - | ltrimstr("windows") -; -def windows_release: # "ltsc2025", "ltsc2022" - env.variant - | split("-")[-1] + include "shared" -}} FROM mcr.microsoft.com/windows/{{ windows_variant }}:{{ windows_release }} @@ -88,7 +80,7 @@ RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ \ Write-Host 'Complete.' {{ ) else ( -}} -COPY --from=openjdk:{{ .version | gsub("[+]"; "-") }}-windowsservercore-{{ windows_release }} $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:{{ tag_version }}-windowsservercore-{{ windows_release }} $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/generate-stackbrew-library.jq b/generate-stackbrew-library.jq index 57daae4e..7444e95d 100644 --- a/generate-stackbrew-library.jq +++ b/generate-stackbrew-library.jq @@ -1,3 +1,4 @@ +include "shared"; to_entries | .[] @@ -8,17 +9,7 @@ to_entries select(IN($major; $ARGS.positional[])) else . end -| ( - .version - | gsub("[+]"; "-") - # if fullVersion is only digits, add "-rc" to the end (because we're probably in the final-phases of pre-release before GA when we drop support from the image) - | if test("^[0-9.]+$") then - . + "-rc" - else . end - | if contains("-ea") or contains("-rc") then . else - error("invalid version; too GA: \(.) (\($major))") - end -) as $version +| tag_version as $version # generate a list of "version tags", stopping the vector at the first "-ea" or "-rc" component suffix # "AA-ea-BB.CC" -> [ "AA-ea-BB.CC", "AA-ea-BB", "AA-ea" ] @@ -94,8 +85,9 @@ else . end "Architectures: \($arches | join(", "))", if $variant | startswith("windows/") then $variant - | split("-")[-1] as $winver + | windows_release as $winver | [ + # TODO use windows_variant from shared.jq? if startswith("windows/nanoserver-") then "nanoserver-" + $winver else empty end, diff --git a/shared.jq b/shared.jq new file mode 100644 index 00000000..869d53a7 --- /dev/null +++ b/shared.jq @@ -0,0 +1,22 @@ +def tag_version: + .version + | . as $ver + | gsub("[+]"; "-") + # if fullVersion is only digits, add "-rc" to the end (because we're probably in the final-phases of pre-release before GA when we drop support from the image) + | if test("^[0-9]+$") then + . + "-rc" + else . end + | if contains("-ea") or contains("-rc") then . else + error("invalid version; too GA: \(.) (\($ver))") + end +; +def windows_variant: # "servercore", "nanoserver" + if env.variant then env.variant else . end + | split("/")[-1] + | split("-")[0] + | ltrimstr("windows") +; +def windows_release: # "ltsc2025", "ltsc2022" + if env.variant then env.variant else . end + | split("-")[-1] +; diff --git a/versions.json b/versions.json index f3623271..58bfc284 100644 --- a/versions.json +++ b/versions.json @@ -1,18 +1,18 @@ { "26": { - "version": "26-ea+33", + "version": "26", "arches": { "amd64": { - "url": "https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-x64_bin.tar.gz", - "sha256": "9491eba6266080ac690d5e31b7776f5c94188c3f8092874d9fd250660d51050e" + "url": "https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-x64_bin.tar.gz", + "sha256": "e7c907ec1036e5480609f8212e6f1e7f710310e029d097e4e1a9645c43676945" }, "arm64v8": { - "url": "https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_linux-aarch64_bin.tar.gz", - "sha256": "f9ebfe93a1ff1ebbc6d7b3a4348b1197797f1c57c9f7a69b2bed30014af4039e" + "url": "https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_linux-aarch64_bin.tar.gz", + "sha256": "aeb9ccc00550a012197834334a9a6cbc03e7938774fcaf59dfa7ed158b66465f" }, "windows-amd64": { - "url": "https://download.java.net/java/early_access/jdk26/33/GPL/openjdk-26-ea+33_windows-x64_bin.zip", - "sha256": "1613acc47081355dcb54aca5db4a0cc088734861b42bd254657ab88fd50944ec" + "url": "https://download.java.net/java/GA/jdk26/c3cc523845074aa0af4f5e1e1ed4151d/34/GPL/openjdk-26_windows-x64_bin.zip", + "sha256": "a2dc3240208c735fe8107f27641987dd1283ad7e896d9aabaccb363fd93673ff" } }, "variants": [ @@ -29,19 +29,19 @@ ] }, "27": { - "version": "27-ea+7", + "version": "27-ea+8", "arches": { "amd64": { - "url": "https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-x64_bin.tar.gz", - "sha256": "951349bfcc6bf08d72f89175460216f0560a6c238848d93c2e194313a78b130e" + "url": "https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-x64_bin.tar.gz", + "sha256": "26424619f5fc68be80026db27b8d73d0e36e791df4b4c4e8dbee4edae1f8ffeb" }, "arm64v8": { - "url": "https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_linux-aarch64_bin.tar.gz", - "sha256": "3a3b7bac8a0432795430d519edf6eb790b6a3423b00516b74c85e1b7edb053a7" + "url": "https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_linux-aarch64_bin.tar.gz", + "sha256": "7ca3627abde323298007e3644968cd30d4363d289840c83bd0b8b49ccd84da51" }, "windows-amd64": { - "url": "https://download.java.net/java/early_access/jdk27/7/GPL/openjdk-27-ea+7_windows-x64_bin.zip", - "sha256": "5940fbffa36c927e8b186d5bcdaa99e332aebc16b642bb272e05e5cce059d4a3" + "url": "https://download.java.net/java/early_access/jdk27/8/GPL/openjdk-27-ea+8_windows-x64_bin.zip", + "sha256": "d3ecddd6cae9d89198ec453bda26dd10c1e83e3bfcac8040a493acad08a14c6f" } }, "variants": [