diff --git a/19/jdk/alpine3.15/Dockerfile b/19/jdk/alpine3.15/Dockerfile deleted file mode 100644 index 36d0150b..00000000 --- a/19/jdk/alpine3.15/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.15 - -RUN apk add --no-cache java-cacerts - -ENV JAVA_HOME /opt/openjdk-19 -ENV PATH $JAVA_HOME/bin:$PATH - -# https://jdk.java.net/ -# > -# > Java Development Kit builds, from Oracle -# > -ENV JAVA_VERSION 19-ea+5 -# "For Alpine Linux, builds are produced on a reduced schedule and may not be in sync with the other platforms." - -RUN set -eux; \ - \ - arch="$(apk --print-arch)"; \ - case "$arch" in \ - 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/alpine/5/binaries/openjdk-19-ea+5_linux-x64-musl_bin.tar.gz'; \ - downloadSha256='0ee67a41fe97341f131bd4f065ed6092d55c15de5f00f8ba1e57d21eefb2c787'; \ - ;; \ - *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ - esac; \ - \ - wget -O openjdk.tgz "$downloadUrl"; \ - echo "$downloadSha256 *openjdk.tgz" | sha256sum -c -; \ - \ - mkdir -p "$JAVA_HOME"; \ - tar --extract \ - --file openjdk.tgz \ - --directory "$JAVA_HOME" \ - --strip-components 1 \ - --no-same-owner \ - ; \ - rm openjdk.tgz*; \ - \ - rm -rf "$JAVA_HOME/lib/security/cacerts"; \ -# see "java-cacerts" package installed above (which maintains "/etc/ssl/certs/java/cacerts" for us) - ln -sT /etc/ssl/certs/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \ - \ -# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840 -# https://openjdk.java.net/jeps/341 - java -Xshare:dump; \ - \ -# basic smoke test - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - javac --version; \ - java --version - -# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) -CMD ["jshell"] diff --git a/19/jdk/alpine3.16/Dockerfile b/19/jdk/alpine3.16/Dockerfile deleted file mode 100644 index 59dfe378..00000000 --- a/19/jdk/alpine3.16/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM alpine:3.16 - -RUN apk add --no-cache java-cacerts - -ENV JAVA_HOME /opt/openjdk-19 -ENV PATH $JAVA_HOME/bin:$PATH - -# https://jdk.java.net/ -# > -# > Java Development Kit builds, from Oracle -# > -ENV JAVA_VERSION 19-ea+5 -# "For Alpine Linux, builds are produced on a reduced schedule and may not be in sync with the other platforms." - -RUN set -eux; \ - \ - arch="$(apk --print-arch)"; \ - case "$arch" in \ - 'x86_64') \ - downloadUrl='https://download.java.net/java/early_access/alpine/5/binaries/openjdk-19-ea+5_linux-x64-musl_bin.tar.gz'; \ - downloadSha256='0ee67a41fe97341f131bd4f065ed6092d55c15de5f00f8ba1e57d21eefb2c787'; \ - ;; \ - *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ - esac; \ - \ - wget -O openjdk.tgz "$downloadUrl"; \ - echo "$downloadSha256 *openjdk.tgz" | sha256sum -c -; \ - \ - mkdir -p "$JAVA_HOME"; \ - tar --extract \ - --file openjdk.tgz \ - --directory "$JAVA_HOME" \ - --strip-components 1 \ - --no-same-owner \ - ; \ - rm openjdk.tgz*; \ - \ - rm -rf "$JAVA_HOME/lib/security/cacerts"; \ -# see "java-cacerts" package installed above (which maintains "/etc/ssl/certs/java/cacerts" for us) - ln -sT /etc/ssl/certs/java/cacerts "$JAVA_HOME/lib/security/cacerts"; \ - \ -# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840 -# https://openjdk.java.net/jeps/341 - java -Xshare:dump; \ - \ -# basic smoke test - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - javac --version; \ - java --version - -# "jshell" is an interactive REPL for Java (see https://en.wikipedia.org/wiki/JShell) -CMD ["jshell"] diff --git a/19/jdk/bullseye/Dockerfile b/19/jdk/bullseye/Dockerfile index efbafd2f..2f79dbb2 100644 --- a/19/jdk/bullseye/Dockerfile +++ b/19/jdk/bullseye/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/buster/Dockerfile b/19/jdk/buster/Dockerfile index 70b4a5da..d3cdae0c 100644 --- a/19/jdk/buster/Dockerfile +++ b/19/jdk/buster/Dockerfile @@ -37,19 +37,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/oraclelinux7/Dockerfile b/19/jdk/oraclelinux7/Dockerfile index 2024fb6c..9567fdbd 100644 --- a/19/jdk/oraclelinux7/Dockerfile +++ b/19/jdk/oraclelinux7/Dockerfile @@ -31,19 +31,19 @@ ENV LANG en_US.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "$arch" in \ 'i386:x86-64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/oraclelinux8/Dockerfile b/19/jdk/oraclelinux8/Dockerfile index ae30f556..b3e42ea2 100644 --- a/19/jdk/oraclelinux8/Dockerfile +++ b/19/jdk/oraclelinux8/Dockerfile @@ -30,19 +30,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "$arch" in \ 'i386:x86-64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'aarch64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/slim-bullseye/Dockerfile b/19/jdk/slim-bullseye/Dockerfile index 9d7f390c..2f31ea4f 100644 --- a/19/jdk/slim-bullseye/Dockerfile +++ b/19/jdk/slim-bullseye/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/slim-buster/Dockerfile b/19/jdk/slim-buster/Dockerfile index af0120b0..3055974e 100644 --- a/19/jdk/slim-buster/Dockerfile +++ b/19/jdk/slim-buster/Dockerfile @@ -24,19 +24,19 @@ ENV LANG C.UTF-8 # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 RUN set -eux; \ \ arch="$(dpkg --print-architecture)"; \ case "$arch" in \ 'amd64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz'; \ - downloadSha256='719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz'; \ + downloadSha256='dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261'; \ ;; \ 'arm64') \ - downloadUrl='https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz'; \ - downloadSha256='8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b'; \ + downloadUrl='https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz'; \ + downloadSha256='123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39'; \ ;; \ *) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \ esac; \ diff --git a/19/jdk/windows/nanoserver-1809/Dockerfile b/19/jdk/windows/nanoserver-1809/Dockerfile index 710534eb..b6a4d23e 100644 --- a/19/jdk/windows/nanoserver-1809/Dockerfile +++ b/19/jdk/windows/nanoserver-1809/Dockerfile @@ -20,9 +20,9 @@ USER ContainerUser # > # > Java Development Kit builds, from Oracle # > -ENV JAVA_VERSION 19-ea+34 +ENV JAVA_VERSION 19 -COPY --from=openjdk:19-ea-34-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME +COPY --from=openjdk:19-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME RUN echo Verifying install ... \ && echo javac --version && javac --version \ diff --git a/19/jdk/windows/windowsservercore-1809/Dockerfile b/19/jdk/windows/windowsservercore-1809/Dockerfile index 87ac30a0..347a4035 100644 --- a/19/jdk/windows/windowsservercore-1809/Dockerfile +++ b/19/jdk/windows/windowsservercore-1809/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 19-ea+34 -ENV JAVA_URL https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_windows-x64_bin.zip -ENV JAVA_SHA256 5d3ac1a89d92a142588bc8546aa737c37d1971bcff17810b5ff947790c97e623 +ENV JAVA_VERSION 19 +ENV JAVA_URL https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_windows-x64_bin.zip +ENV JAVA_SHA256 6c09bc945b2f88b399a23787607b49d91c5a8511a9421338c6e30ea3a6dbde1e RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/19/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/19/jdk/windows/windowsservercore-ltsc2022/Dockerfile index d4de4f33..12c171cc 100644 --- a/19/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/19/jdk/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 19-ea+34 -ENV JAVA_URL https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_windows-x64_bin.zip -ENV JAVA_SHA256 5d3ac1a89d92a142588bc8546aa737c37d1971bcff17810b5ff947790c97e623 +ENV JAVA_VERSION 19 +ENV JAVA_URL https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_windows-x64_bin.zip +ENV JAVA_SHA256 6c09bc945b2f88b399a23787607b49d91c5a8511a9421338c6e30ea3a6dbde1e RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ diff --git a/versions.json b/versions.json index 51bd6504..af2e2848 100644 --- a/versions.json +++ b/versions.json @@ -72,30 +72,19 @@ "version": "18.0.2" }, "19": { - "alpine": { - "jdk": { - "arches": { - "amd64": { - "sha256": "0ee67a41fe97341f131bd4f065ed6092d55c15de5f00f8ba1e57d21eefb2c787", - "url": "https://download.java.net/java/early_access/alpine/5/binaries/openjdk-19-ea+5_linux-x64-musl_bin.tar.gz" - } - } - }, - "version": "19-ea+5" - }, "jdk": { "arches": { "amd64": { - "sha256": "719889f7aaf988e7ec5c6edd0c3bd03342294f329a36dd6591af2e64f6aefae7", - "url": "https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-x64_bin.tar.gz" + "sha256": "dce3307e59c2dc3cadd9f1e23f89916a1dc88e900507c0ee2677f2f385e9b261", + "url": "https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-x64_bin.tar.gz" }, "arm64v8": { - "sha256": "8d5d5327b1a7d35ae2c16ba69701cb58cb5b5df58f5ace295c08fe77d96a688b", - "url": "https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_linux-aarch64_bin.tar.gz" + "sha256": "123347c3bbe9840d3701fba42afa336b3a89266613c6365f98a5b9eee363cc39", + "url": "https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_linux-aarch64_bin.tar.gz" }, "windows-amd64": { - "sha256": "5d3ac1a89d92a142588bc8546aa737c37d1971bcff17810b5ff947790c97e623", - "url": "https://download.java.net/java/early_access/jdk19/34/GPL/openjdk-19-ea+34_windows-x64_bin.zip" + "sha256": "6c09bc945b2f88b399a23787607b49d91c5a8511a9421338c6e30ea3a6dbde1e", + "url": "https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/35/GPL/openjdk-19_windows-x64_bin.zip" } } }, @@ -107,13 +96,11 @@ "slim-bullseye", "buster", "slim-buster", - "alpine3.16", - "alpine3.15", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", "windows/nanoserver-1809" ], - "version": "19-ea+34" + "version": "19" }, "20": { "jdk": {