From fab1753b72b509ee4046441be329090e0cb574ae Mon Sep 17 00:00:00 2001 From: eclipse-temurin-bot Date: Wed, 25 Oct 2023 16:35:49 +0000 Subject: [PATCH 1/4] dockerfile: automated nightly updates --- 11/jdk/alpine/Dockerfile | 3 ++- 11/jdk/centos/Dockerfile | 3 ++- 11/jdk/ubi/ubi9-minimal/Dockerfile | 3 ++- 11/jdk/ubuntu/focal/Dockerfile | 3 ++- 11/jdk/ubuntu/jammy/Dockerfile | 3 ++- 11/jre/alpine/Dockerfile | 3 ++- 11/jre/centos/Dockerfile | 3 ++- 11/jre/ubi/ubi9-minimal/Dockerfile | 3 ++- 11/jre/ubuntu/focal/Dockerfile | 3 ++- 11/jre/ubuntu/jammy/Dockerfile | 3 ++- 17/jdk/alpine/Dockerfile | 3 ++- 17/jdk/centos/Dockerfile | 11 ++++++----- 17/jdk/ubi/ubi9-minimal/Dockerfile | 11 ++++++----- 17/jdk/ubuntu/focal/Dockerfile | 11 ++++++----- 17/jdk/ubuntu/jammy/Dockerfile | 11 ++++++----- 17/jre/alpine/Dockerfile | 3 ++- 17/jre/centos/Dockerfile | 11 ++++++----- 17/jre/ubi/ubi9-minimal/Dockerfile | 11 ++++++----- 17/jre/ubuntu/focal/Dockerfile | 11 ++++++----- 17/jre/ubuntu/jammy/Dockerfile | 11 ++++++----- 21/jdk/alpine/Dockerfile | 11 ++++++----- 21/jdk/ubi/ubi9-minimal/Dockerfile | 11 ++++++----- 21/jdk/ubuntu/jammy/Dockerfile | 11 ++++++----- 21/jre/alpine/Dockerfile | 11 ++++++----- 21/jre/ubi/ubi9-minimal/Dockerfile | 11 ++++++----- 21/jre/ubuntu/jammy/Dockerfile | 11 ++++++----- 8/jdk/centos/Dockerfile | 3 +-- 8/jdk/ubi/ubi9-minimal/Dockerfile | 3 +-- 8/jdk/ubuntu/focal/Dockerfile | 3 +-- 8/jdk/ubuntu/jammy/Dockerfile | 3 +-- 8/jdk/windows/nanoserver-1809/Dockerfile | 3 +-- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 3 +-- 8/jre/centos/Dockerfile | 3 +-- 8/jre/ubi/ubi9-minimal/Dockerfile | 3 +-- 8/jre/ubuntu/focal/Dockerfile | 3 +-- 8/jre/ubuntu/jammy/Dockerfile | 3 +-- 8/jre/windows/nanoserver-1809/Dockerfile | 3 +-- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 3 +-- 38 files changed, 120 insertions(+), 106 deletions(-) diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index 71de566c6..bbc0cafe5 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -56,7 +56,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/11/jdk/centos/Dockerfile b/11/jdk/centos/Dockerfile index 84e6b2137..522d814ad 100644 --- a/11/jdk/centos/Dockerfile +++ b/11/jdk/centos/Dockerfile @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 44c244f22..819dad02b 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -65,7 +65,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index f686b6b8d..f652d3998 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 2e6963b63..6aa0aa04e 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index 5f9b00ae3..5174374de 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -56,7 +56,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/11/jre/centos/Dockerfile b/11/jre/centos/Dockerfile index 7942af501..f09c9dc7f 100644 --- a/11/jre/centos/Dockerfile +++ b/11/jre/centos/Dockerfile @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 390aafc13..32f6a83b7 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -65,7 +65,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 4a050c842..f4620e29d 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index 306477a93..9b452d166 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index 7c18920c5..5c1882932 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -56,7 +56,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/17/jdk/centos/Dockerfile b/17/jdk/centos/Dockerfile index 02ad3c779..79715fe93 100644 --- a/17/jdk/centos/Dockerfile +++ b/17/jdk/centos/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index 6cd332dd7..c8a537346 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -65,7 +65,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 9cddfb9cf..495adc2ec 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index fdd84ae12..39d8fc2ee 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e2c5e26f8572544b201bc22a9b28f2b1a3147ab69be111cea07c7f52af252e75'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='7b175dbe0d6e3c9c23b6ed96449b018308d8fc94a5ecd9c0df8b8bc376c3c18a'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='3ae4b254d5b720f94f986481e787fbd67f0667571140ba2e2ae5020ceddbc826'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 70e0ddf70..609a14832 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -56,7 +56,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/17/jre/centos/Dockerfile b/17/jre/centos/Dockerfile index be193c52c..e18e69a30 100644 --- a/17/jre/centos/Dockerfile +++ b/17/jre/centos/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index 4571911b9..802630e5d 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -65,7 +65,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index a90953668..75e778388 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index fd0c113fe..ae48746a4 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-17.0.9+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ - BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='05b192f81ed478178ba953a2a779b67fc5a810acadb633ad69f8c4412399edb8'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.9_9.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='c37f729200b572884b8f8e157852c739be728d61d9a1da0f920104876d324733'; \ + BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.9_9.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='79c85ecf1320c67b828310167e1ced62e402bc86a5d47ca9cc7bfa3b708cb07a'; \ BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.9_9.tar.gz'; \ @@ -74,7 +74,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index 09dea9d66..8bf22d290 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - amd64|x86_64) \ - ESUM='422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|x86_64) \ + ESUM='422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ @@ -60,7 +60,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 237a54572..f744ac96e 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz'; \ @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index a8f501d42..d9b446ad6 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz'; \ @@ -70,7 +70,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo javac --version && javac --version \ && echo java --version && java --version \ diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 49c89aae9..bf4d68323 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ case "${ARCH}" in \ - amd64|x86_64) \ - ESUM='a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|x86_64) \ + ESUM='a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_alpine-linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ exit 1; \ @@ -60,7 +60,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index 902f656e8..83c037995 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -33,14 +33,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(objdump="$(command -v objdump)" && objdump --file-headers "$objdump" | awk -F '[:,]+[[:space:]]+' '$1 == "architecture" { print $2 }')"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz'; \ @@ -61,7 +61,8 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index b907608fa..c081e1305 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -36,14 +36,14 @@ ENV JAVA_VERSION jdk-21.0.1+12 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ - amd64|i386:x86-64) \ - ESUM='277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3'; \ - BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz'; \ - ;; \ aarch64|arm64) \ ESUM='4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz'; \ ;; \ + amd64|i386:x86-64) \ + ESUM='277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3'; \ + BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz'; \ + ;; \ ppc64el|powerpc:common64) \ ESUM='05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2'; \ BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz'; \ @@ -70,7 +70,8 @@ RUN set -eux; \ # https://openjdk.java.net/jeps/341 java -Xshare:dump; -RUN echo Verifying install ... \ +RUN set -eux; \ + && echo Verifying install ... \ && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ && echo java --version && java --version \ && echo Complete. diff --git a/8/jdk/centos/Dockerfile b/8/jdk/centos/Dockerfile index aaa763809..918fe48a1 100644 --- a/8/jdk/centos/Dockerfile +++ b/8/jdk/centos/Dockerfile @@ -61,8 +61,7 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index d1c8fd227..414242230 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -61,8 +61,7 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 629aef4e5..191a77e6d 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -67,8 +67,7 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 90870cf30..2199d6fee 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -67,8 +67,7 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 609aff572..5c307b941 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -33,7 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 6d719e754..1b67c653b 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -33,7 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo javac -version && javac -version \ +RUN && echo javac -version && javac -version \ && echo java -version && java -version \ && echo Complete. diff --git a/8/jre/centos/Dockerfile b/8/jre/centos/Dockerfile index ea460791e..1a2ff7300 100644 --- a/8/jre/centos/Dockerfile +++ b/8/jre/centos/Dockerfile @@ -61,8 +61,7 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index 845d9c437..e4f8134ee 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -61,8 +61,7 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index ffbcb1cef..4237c7414 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -67,8 +67,7 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 3412c95bc..d0c794041 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -67,8 +67,7 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index 8d75a2414..0806c5446 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -33,6 +33,5 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index c4481cb96..f2f47d954 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -33,6 +33,5 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo java -version && java -version \ +RUN && echo java -version && java -version \ && echo Complete. From 90c7ef440ec7e32f278681b8e67e3d9bcd42eeec Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 25 Oct 2023 17:35:41 +0100 Subject: [PATCH 2/4] add comments to dependencies for easier auditing --- docker_templates/centos.Dockerfile.j2 | 24 +++++++++++++-- .../partials/multi-arch-install.j2 | 2 +- docker_templates/partials/version-check.j2 | 23 +++++---------- docker_templates/ubuntu.Dockerfile.j2 | 29 +++++++++++++++---- 4 files changed, 54 insertions(+), 24 deletions(-) diff --git a/docker_templates/centos.Dockerfile.j2 b/docker_templates/centos.Dockerfile.j2 index 5fb0d7d4f..f28e53fb7 100644 --- a/docker_templates/centos.Dockerfile.j2 +++ b/docker_templates/centos.Dockerfile.j2 @@ -4,8 +4,28 @@ FROM {{ base_image }} {% include 'partials/nix-env.j2' %} -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar {% if version|int >= 13 %}binutils {% endif %}\ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + {% if version|int < 22 -%} + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + {% endif -%} + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + {% if version|int >= 13 -%} + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + {% endif -%} + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION {{ java_version }} diff --git a/docker_templates/partials/multi-arch-install.j2 b/docker_templates/partials/multi-arch-install.j2 index 7af8485f9..bf115f2fb 100644 --- a/docker_templates/partials/multi-arch-install.j2 +++ b/docker_templates/partials/multi-arch-install.j2 @@ -16,7 +16,7 @@ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ diff --git a/docker_templates/partials/version-check.j2 b/docker_templates/partials/version-check.j2 index 7913d2691..6d6f496a2 100644 --- a/docker_templates/partials/version-check.j2 +++ b/docker_templates/partials/version-check.j2 @@ -1,19 +1,10 @@ -RUN {% if version|int >= 11 -%} - {% if os_family != "windows" -%} - set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - {% else -%} - echo Verifying install ... \ +RUN {% if os_family != "windows" %}set -eux; \ + {% else %}{% endif %}echo "Verifying install ..."; \ + {% if os_family != "windows" and version|int >= 11 -%} + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ {% endif -%} {% if image_type == "jdk" -%} - && echo javac --version && javac --version \ + echo javac {% if version|int >= 11 %}--{% else %}-{% endif %}version && javac {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ {% endif -%} - && echo java --version && java --version \ - {% else -%} - {% if image_type == "jdk" -%} - && echo javac -version && javac -version \ - {% endif -%} - && echo java -version && java -version \ - {% endif -%} - && echo Complete. \ No newline at end of file + echo java {% if version|int >= 11 %}--{% else %}-{% endif %}version && java {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ + echo "Complete." \ No newline at end of file diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index ff5b6e8c5..8991dc917 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -4,11 +4,30 @@ FROM {{ base_image }} {% include 'partials/nix-env.j2' %} -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit {% if version|int >= 13 %}binutils {% endif %}\ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + {% if version|int < 22 -%} + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + {% endif -%} + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + {% if version|int >= 13 -%} + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + {% endif -%} + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION {{ java_version }} From c0107d7af743e5bdadca5c53e894fbca9e8ba302 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 25 Oct 2023 18:20:53 +0100 Subject: [PATCH 3/4] updates --- 11/jdk/alpine/Dockerfile | 12 +++--- 11/jdk/centos/Dockerfile | 29 +++++++++++---- 11/jdk/ubi/ubi9-minimal/Dockerfile | 12 +++--- 11/jdk/ubuntu/focal/Dockerfile | 34 +++++++++++------ 11/jdk/ubuntu/jammy/Dockerfile | 34 +++++++++++------ 11/jdk/windows/nanoserver-1809/Dockerfile | 8 ++-- 11/jdk/windows/nanoserver-ltsc2022/Dockerfile | 8 ++-- 11/jre/alpine/Dockerfile | 10 ++--- 11/jre/centos/Dockerfile | 27 ++++++++++---- 11/jre/ubi/ubi9-minimal/Dockerfile | 10 ++--- 11/jre/ubuntu/focal/Dockerfile | 32 +++++++++++----- 11/jre/ubuntu/jammy/Dockerfile | 32 +++++++++++----- 11/jre/windows/nanoserver-1809/Dockerfile | 6 +-- 11/jre/windows/nanoserver-ltsc2022/Dockerfile | 6 +-- 17/jdk/alpine/Dockerfile | 12 +++--- 17/jdk/centos/Dockerfile | 32 ++++++++++++---- 17/jdk/ubi/ubi9-minimal/Dockerfile | 12 +++--- 17/jdk/ubuntu/focal/Dockerfile | 37 +++++++++++++------ 17/jdk/ubuntu/jammy/Dockerfile | 37 +++++++++++++------ 17/jre/alpine/Dockerfile | 10 ++--- 17/jre/centos/Dockerfile | 30 +++++++++++---- 17/jre/ubi/ubi9-minimal/Dockerfile | 10 ++--- 17/jre/ubuntu/focal/Dockerfile | 35 +++++++++++++----- 17/jre/ubuntu/jammy/Dockerfile | 35 +++++++++++++----- 21/jdk/alpine/Dockerfile | 12 +++--- 21/jdk/ubi/ubi9-minimal/Dockerfile | 12 +++--- 21/jdk/ubuntu/jammy/Dockerfile | 37 +++++++++++++------ 21/jre/alpine/Dockerfile | 10 ++--- 21/jre/ubi/ubi9-minimal/Dockerfile | 10 ++--- 21/jre/ubuntu/jammy/Dockerfile | 35 +++++++++++++----- 8/jdk/centos/Dockerfile | 27 +++++++++++--- 8/jdk/ubi/ubi9-minimal/Dockerfile | 10 +++-- 8/jdk/ubuntu/focal/Dockerfile | 32 +++++++++++----- 8/jdk/ubuntu/jammy/Dockerfile | 32 +++++++++++----- 8/jdk/windows/nanoserver-1809/Dockerfile | 7 ++-- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 7 ++-- 8/jre/centos/Dockerfile | 25 ++++++++++--- 8/jre/ubi/ubi9-minimal/Dockerfile | 8 ++-- 8/jre/ubuntu/focal/Dockerfile | 30 +++++++++++---- 8/jre/ubuntu/jammy/Dockerfile | 30 +++++++++++---- 8/jre/windows/nanoserver-1809/Dockerfile | 5 ++- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 5 ++- 42 files changed, 567 insertions(+), 277 deletions(-) diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index bbc0cafe5..da3b4a62f 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -57,11 +57,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/centos/Dockerfile b/11/jdk/centos/Dockerfile index 522d814ad..613e0b2dc 100644 --- a/11/jdk/centos/Dockerfile +++ b/11/jdk/centos/Dockerfile @@ -25,8 +25,21 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk-11.0.21+9 @@ -50,7 +63,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,11 +75,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 819dad02b..ab25f0023 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -66,11 +66,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index f652d3998..f2c324abf 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -57,7 +69,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,11 +87,11 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 6aa0aa04e..caafebd45 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -57,7 +69,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,11 +87,11 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile index 06c4f8251..82cc12609 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile +++ b/11/jdk/windows/nanoserver-1809/Dockerfile @@ -33,9 +33,9 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile index a5d681f7f..a3bc8d2ca 100644 --- a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -33,9 +33,9 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." CMD ["jshell"] diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index 5174374de..4398bfa76 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -57,9 +57,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/centos/Dockerfile b/11/jre/centos/Dockerfile index f09c9dc7f..f06f70bfc 100644 --- a/11/jre/centos/Dockerfile +++ b/11/jre/centos/Dockerfile @@ -25,8 +25,21 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk-11.0.21+9 @@ -50,7 +63,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,9 +75,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 32f6a83b7..823df3e9c 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -66,9 +66,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index f4620e29d..0ab7eab5b 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -57,7 +69,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,9 +87,9 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index 9b452d166..a0769daad 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -57,7 +69,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,9 +87,9 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/windows/nanoserver-1809/Dockerfile b/11/jre/windows/nanoserver-1809/Dockerfile index 889cdb7e8..85cc2b8fd 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile +++ b/11/jre/windows/nanoserver-1809/Dockerfile @@ -33,6 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo java --version && java --version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo java --version && java --version; \ + echo "Complete." diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile b/11/jre/windows/nanoserver-ltsc2022/Dockerfile index fd7a68b53..b0d442385 100644 --- a/11/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -33,6 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN echo Verifying install ... \ - && echo java --version && java --version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo java --version && java --version; \ + echo "Complete." diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index 5c1882932..0fb4a76b5 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -57,11 +57,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/centos/Dockerfile b/17/jdk/centos/Dockerfile index 79715fe93..feeef3bdc 100644 --- a/17/jdk/centos/Dockerfile +++ b/17/jdk/centos/Dockerfile @@ -25,8 +25,24 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar binutils \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk-17.0.9+9 @@ -50,7 +66,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,11 +78,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index c8a537346..f080f2ab6 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -66,11 +66,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 495adc2ec..7f456ee8d 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -57,7 +72,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,11 +90,11 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 39d8fc2ee..3e6ebfedc 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -57,7 +72,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,11 +90,11 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 609a14832..3bdcffb5d 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -45,7 +45,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -57,9 +57,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/centos/Dockerfile b/17/jre/centos/Dockerfile index e18e69a30..e6f2c5203 100644 --- a/17/jre/centos/Dockerfile +++ b/17/jre/centos/Dockerfile @@ -25,8 +25,24 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar binutils \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk-17.0.9+9 @@ -50,7 +66,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,9 +78,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index 802630e5d..daeeb9fe1 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -66,9 +66,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index 75e778388..cbc6eb71d 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -57,7 +72,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,9 +90,9 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index ae48746a4..a0f7d6fee 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -57,7 +72,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -75,9 +90,9 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index 8bf22d290..c02aab79c 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,11 +61,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index f744ac96e..45d43849b 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,11 +62,11 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index d9b446ad6..c9f237228 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-21.0.1+12 @@ -53,7 +68,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -71,11 +86,11 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo javac --version && javac --version \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo javac --version && javac --version; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index bf4d68323..d8ec25052 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -49,7 +49,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,9 +61,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index 83c037995..4947721ff 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,9 +62,9 @@ RUN set -eux; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index c081e1305..28b943366 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -25,11 +25,26 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit binutils \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351 + # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory + binutils \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk-21.0.1+12 @@ -53,7 +68,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -71,9 +86,9 @@ RUN set -eux; \ java -Xshare:dump; RUN set -eux; \ - && echo Verifying install ... \ - && fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java \ - && echo java --version && java --version \ - && echo Complete. + echo "Verifying install ..."; \ + fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ + echo java --version && java --version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/centos/Dockerfile b/8/jdk/centos/Dockerfile index 918fe48a1..c832b925e 100644 --- a/8/jdk/centos/Dockerfile +++ b/8/jdk/centos/Dockerfile @@ -25,8 +25,21 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk8u392-b08 @@ -50,7 +63,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,8 +74,10 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 414242230..1c84b0d57 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,8 +61,10 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 191a77e6d..1165f843a 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk8u392-b08 @@ -53,7 +65,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -67,8 +79,10 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 2199d6fee..ae35c3d7f 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk8u392-b08 @@ -53,7 +65,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -67,8 +79,10 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 5c307b941..8aa6c07b9 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -33,6 +33,7 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 1b67c653b..5981e745c 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -33,6 +33,7 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN && echo javac -version && javac -version \ - && echo java -version && java -version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo javac -version && javac -version; \ + echo java -version && java -version; \ + echo "Complete." diff --git a/8/jre/centos/Dockerfile b/8/jre/centos/Dockerfile index 1a2ff7300..06b197250 100644 --- a/8/jre/centos/Dockerfile +++ b/8/jre/centos/Dockerfile @@ -25,8 +25,21 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN yum install -y tzdata openssl curl wget ca-certificates fontconfig gzip tar \ - && yum clean all +RUN set -eux; \ + yum install -y \ + gzip \ + tar \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + tzdata \ + openssl \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates \ + fontconfig \ + ; \ + rm -rf /var/cache/yum ENV JAVA_VERSION jdk8u392-b08 @@ -50,7 +63,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,7 +74,9 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index e4f8134ee..7402fc14b 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -61,7 +61,9 @@ RUN set -eux; \ ; \ rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; -RUN && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 4237c7414..e0242acbf 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk8u392-b08 @@ -53,7 +65,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -67,7 +79,9 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index d0c794041..daf63ac63 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -25,11 +25,23 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl wget ca-certificates fontconfig locales p11-kit \ - && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ - && locale-gen en_US.UTF-8 \ - && rm -rf /var/lib/apt/lists/* +RUN set -eux; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255 + curl \ + wget \ + fontconfig \ + # utilities for keeping Ubuntu and OpenJDK CA certificates in sync + # https://github.com/adoptium/containers/issues/293 + ca-certificates p11-kit \ + tzdata \ + # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 + locales \ + ; \ + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \ + locale-gen en_US.UTF-8; \ + rm -rf /var/lib/apt/lists/* ENV JAVA_VERSION jdk8u392-b08 @@ -53,7 +65,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -67,7 +79,9 @@ RUN set -eux; \ find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \ ldconfig; -RUN && echo java -version && java -version \ - && echo Complete. +RUN set -eux; \ + echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index 0806c5446..108e1ba5c 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -33,5 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME -RUN && echo java -version && java -version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index f2f47d954..a3cdf311c 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -33,5 +33,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME -RUN && echo java -version && java -version \ - && echo Complete. +RUN echo "Verifying install ..."; \ + echo java -version && java -version; \ + echo "Complete." From 334e8c9f3498eff0bf581a23b16f399f19564630 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 25 Oct 2023 18:32:08 +0100 Subject: [PATCH 4/4] fixes --- 11/jdk/alpine/Dockerfile | 17 +++++++++-------- 11/jdk/centos/Dockerfile | 4 ++-- 11/jdk/ubi/ubi9-minimal/Dockerfile | 9 +++++---- 11/jdk/ubuntu/focal/Dockerfile | 4 ++-- 11/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 11/jdk/windows/nanoserver-1809/Dockerfile | 4 ++-- 11/jdk/windows/nanoserver-ltsc2022/Dockerfile | 4 ++-- 11/jre/alpine/Dockerfile | 16 ++++++++-------- 11/jre/centos/Dockerfile | 3 +-- 11/jre/ubi/ubi9-minimal/Dockerfile | 8 ++++---- 11/jre/ubuntu/focal/Dockerfile | 3 +-- 11/jre/ubuntu/jammy/Dockerfile | 3 +-- 11/jre/windows/nanoserver-1809/Dockerfile | 2 +- 11/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jdk/alpine/Dockerfile | 17 +++++++++-------- 17/jdk/centos/Dockerfile | 4 ++-- 17/jdk/ubi/ubi9-minimal/Dockerfile | 9 +++++---- 17/jdk/ubuntu/focal/Dockerfile | 4 ++-- 17/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 17/jre/alpine/Dockerfile | 16 ++++++++-------- 17/jre/centos/Dockerfile | 3 +-- 17/jre/ubi/ubi9-minimal/Dockerfile | 8 ++++---- 17/jre/ubuntu/focal/Dockerfile | 3 +-- 17/jre/ubuntu/jammy/Dockerfile | 3 +-- 21/jdk/alpine/Dockerfile | 17 +++++++++-------- 21/jdk/ubi/ubi9-minimal/Dockerfile | 9 +++++---- 21/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 21/jre/alpine/Dockerfile | 16 ++++++++-------- 21/jre/ubi/ubi9-minimal/Dockerfile | 8 ++++---- 21/jre/ubuntu/jammy/Dockerfile | 3 +-- 8/jdk/centos/Dockerfile | 4 ++-- 8/jdk/ubi/ubi9-minimal/Dockerfile | 9 +++++---- 8/jdk/ubuntu/focal/Dockerfile | 4 ++-- 8/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 8/jdk/windows/nanoserver-1809/Dockerfile | 4 ++-- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 4 ++-- 8/jre/centos/Dockerfile | 2 +- 8/jre/ubi/ubi9-minimal/Dockerfile | 7 ++++--- 8/jre/ubuntu/focal/Dockerfile | 2 +- 8/jre/ubuntu/jammy/Dockerfile | 2 +- 8/jre/windows/nanoserver-1809/Dockerfile | 2 +- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- docker_templates/alpine-linux.Dockerfile.j2 | 11 ++++++----- docker_templates/partials/multi-arch-install.j2 | 2 +- docker_templates/partials/version-check.j2 | 6 +++--- docker_templates/ubi9-minimal.Dockerfile.j2 | 5 +++-- test_generate_dockerfiles.py | 16 ++++++++-------- 47 files changed, 150 insertions(+), 147 deletions(-) diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index da3b4a62f..104bd8e1c 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -45,7 +46,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -59,8 +60,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/centos/Dockerfile b/11/jdk/centos/Dockerfile index 613e0b2dc..ef5d357bc 100644 --- a/11/jdk/centos/Dockerfile +++ b/11/jdk/centos/Dockerfile @@ -77,8 +77,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index ab25f0023..0ad81f47c 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-11.0.21+9 @@ -68,8 +69,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index f2c324abf..0b413f6f3 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -89,8 +89,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index caafebd45..907e7177e 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -89,8 +89,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile index 82cc12609..39ff4ee50 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile +++ b/11/jdk/windows/nanoserver-1809/Dockerfile @@ -34,8 +34,8 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." CMD ["jshell"] diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile index a3bc8d2ca..d96bd01b4 100644 --- a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -34,8 +34,8 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." CMD ["jshell"] diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index 4398bfa76..3514b88d3 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-11.0.21+9 @@ -45,7 +46,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -58,8 +59,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/centos/Dockerfile b/11/jre/centos/Dockerfile index f06f70bfc..acd7281ef 100644 --- a/11/jre/centos/Dockerfile +++ b/11/jre/centos/Dockerfile @@ -76,8 +76,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 823df3e9c..ce128d397 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-11.0.21+9 @@ -67,8 +68,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 0ab7eab5b..81428a69e 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -88,8 +88,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index a0769daad..d3cab7b82 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -88,8 +88,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/windows/nanoserver-1809/Dockerfile b/11/jre/windows/nanoserver-1809/Dockerfile index 85cc2b8fd..b36948ed6 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile +++ b/11/jre/windows/nanoserver-1809/Dockerfile @@ -34,5 +34,5 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile b/11/jre/windows/nanoserver-ltsc2022/Dockerfile index b0d442385..3e2733b59 100644 --- a/11/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -34,5 +34,5 @@ USER ContainerUser COPY --from=eclipse-temurin:11.0.21_9-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index 0fb4a76b5..ab320406e 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -45,7 +46,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -59,8 +60,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/centos/Dockerfile b/17/jdk/centos/Dockerfile index feeef3bdc..18718902b 100644 --- a/17/jdk/centos/Dockerfile +++ b/17/jdk/centos/Dockerfile @@ -80,8 +80,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index f080f2ab6..df8662b44 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-17.0.9+9 @@ -68,8 +69,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 7f456ee8d..650c3c614 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -92,8 +92,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 3e6ebfedc..05b2d7870 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -92,8 +92,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 3bdcffb5d..e9555ca2f 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-17.0.9+9 @@ -45,7 +46,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -58,8 +59,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/centos/Dockerfile b/17/jre/centos/Dockerfile index e6f2c5203..5558ee836 100644 --- a/17/jre/centos/Dockerfile +++ b/17/jre/centos/Dockerfile @@ -79,8 +79,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index daeeb9fe1..5eb70ce50 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-17.0.9+9 @@ -67,8 +68,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index cbc6eb71d..430f7801d 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index a0f7d6fee..e674d957b 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -91,8 +91,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index c02aab79c..e18618e96 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-21.0.1+12 @@ -49,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -63,8 +64,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 45d43849b..4723ae699 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-21.0.1+12 @@ -64,8 +65,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index c9f237228..35562be0c 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -88,8 +88,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo javac --version && javac --version; \ - echo java --version && java --version; \ + echo "javac --version"; javac --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index d8ec25052..c941a48e6 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -25,11 +25,12 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION jdk-21.0.1+12 @@ -49,7 +50,7 @@ RUN set -eux; \ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ @@ -62,8 +63,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index 4947721ff..b3e035559 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk-21.0.1+12 @@ -63,8 +64,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index 28b943366..64e476c3b 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -87,8 +87,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ - echo java --version && java --version; \ + echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/centos/Dockerfile b/8/jdk/centos/Dockerfile index c832b925e..a67ac8a69 100644 --- a/8/jdk/centos/Dockerfile +++ b/8/jdk/centos/Dockerfile @@ -76,8 +76,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 1c84b0d57..95ecf4063 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk8u392-b08 @@ -63,8 +64,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 1165f843a..5f272a79e 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -81,8 +81,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index ae35c3d7f..f274819d6 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -81,8 +81,8 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 8aa6c07b9..9837a737b 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -34,6 +34,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 5981e745c..4db3704ca 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -34,6 +34,6 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jdk-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo javac -version && javac -version; \ - echo java -version && java -version; \ + echo "javac -version"; javac -version; \ + echo "java -version"; java -version; \ echo "Complete." diff --git a/8/jre/centos/Dockerfile b/8/jre/centos/Dockerfile index 06b197250..52de2e222 100644 --- a/8/jre/centos/Dockerfile +++ b/8/jre/centos/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index 7402fc14b..8c14979db 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -25,8 +25,9 @@ ENV PATH $JAVA_HOME/bin:$PATH # Default to UTF-8 file.encoding ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION jdk8u392-b08 @@ -63,7 +64,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index e0242acbf..d90a51469 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index daf63ac63..e4ee9ed76 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ RUN set -eux; \ echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index 108e1ba5c..765c3059f 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -34,5 +34,5 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index a3cdf311c..2340d7bfd 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -34,5 +34,5 @@ USER ContainerUser COPY --from=eclipse-temurin:8u392-b08-jre-windowsservercore-ltsc2022 $JAVA_HOME $JAVA_HOME RUN echo "Verifying install ..."; \ - echo java -version && java -version; \ + echo "java -version"; java -version; \ echo "Complete." diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 8c751be21..eeffbc49a 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -4,11 +4,12 @@ FROM {{ base_image }} {% include 'partials/nix-env.j2' %} -# fontconfig and ttf-dejavu added to support serverside image generation by Java programs -# java-cacerts added to support adding CA certificates to the Java keystore -# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415) -RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \ - && rm -rf /var/cache/apk/* +RUN set -eux; \ + # fontconfig and ttf-dejavu added to support serverside image generation by Java programs + # java-cacerts added to support adding CA certificates to the Java keystore + # bash is required for the entrypoint script (see https://github.com/adoptium/containers/issues/415) + apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib; \ + rm -rf /var/cache/apk/* ENV JAVA_VERSION {{ java_version }} diff --git a/docker_templates/partials/multi-arch-install.j2 b/docker_templates/partials/multi-arch-install.j2 index bf115f2fb..b315f1358 100644 --- a/docker_templates/partials/multi-arch-install.j2 +++ b/docker_templates/partials/multi-arch-install.j2 @@ -16,7 +16,7 @@ exit 1; \ ;; \ esac; \ - wget --progress=dot:giga -O /tmp/openjdk.tar.gz ${BINARY_URL}; \ + wget {% if os != "alpine-linux" %}--progress=dot:giga {% endif %}-O /tmp/openjdk.tar.gz ${BINARY_URL}; \ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract \ diff --git a/docker_templates/partials/version-check.j2 b/docker_templates/partials/version-check.j2 index 6d6f496a2..5ed2fe14a 100644 --- a/docker_templates/partials/version-check.j2 +++ b/docker_templates/partials/version-check.j2 @@ -1,10 +1,10 @@ RUN {% if os_family != "windows" %}set -eux; \ {% else %}{% endif %}echo "Verifying install ..."; \ - {% if os_family != "windows" and version|int >= 11 -%} + {% if os_family != "windows" and image_type == "jdk" and version|int >= 11 -%} fileEncoding="$(echo 'System.out.println(System.getProperty("file.encoding"))' | jshell -s -)"; [ "$fileEncoding" = 'UTF-8' ]; rm -rf ~/.java; \ {% endif -%} {% if image_type == "jdk" -%} - echo javac {% if version|int >= 11 %}--{% else %}-{% endif %}version && javac {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ + echo "javac {% if version|int >= 11 %}--{% else %}-{% endif %}version"; javac {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ {% endif -%} - echo java {% if version|int >= 11 %}--{% else %}-{% endif %}version && java {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ + echo "java {% if version|int >= 11 %}--{% else %}-{% endif %}version"; java {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ echo "Complete." \ No newline at end of file diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index 083d16d19..9a2ebbfa3 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -4,8 +4,9 @@ FROM {{ base_image }} {% include 'partials/nix-env.j2' %} -RUN microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar \ - && microdnf clean all +RUN set -eux; \ + microdnf install -y binutils tzdata openssl wget ca-certificates fontconfig glibc-langpack-en gzip tar; \ + microdnf clean all ENV JAVA_VERSION {{ java_version }} diff --git a/test_generate_dockerfiles.py b/test_generate_dockerfiles.py index 7828d2bad..dac37b92c 100644 --- a/test_generate_dockerfiles.py +++ b/test_generate_dockerfiles.py @@ -56,8 +56,8 @@ def test_version_checker(self): rendered_template = template.render(**context) # Expected string/partial in the rendered output - expected_string = "&& echo javac --version && javac --version" - self.assertIn(expected_string, rendered_template) + self.assertIn("javac --version", rendered_template) + self.assertIn("java --version", rendered_template) with self.subTest(): # The context/variables to render the template @@ -65,8 +65,8 @@ def test_version_checker(self): rendered_template = template.render(**context) # Expected string/partial in the rendered output - expected_string = "&& echo javac -version && javac -version" - self.assertIn(expected_string, rendered_template) + self.assertIn("javac -version", rendered_template) + self.assertIn("java -version", rendered_template) with self.subTest(): # The context/variables to render the template @@ -74,8 +74,8 @@ def test_version_checker(self): rendered_template = template.render(**context) # Expected string/partial in the rendered output - expected_string = "&& echo javac --version && javac --version" - self.assertNotIn(expected_string, rendered_template) + self.assertNotIn("javac --version", rendered_template) + self.assertIn("java --version", rendered_template) with self.subTest(): # The context/variables to render the template @@ -83,8 +83,8 @@ def test_version_checker(self): rendered_template = template.render(**context) # Expected string/partial in the rendered output - expected_string = "&& echo javac -version && javac -version" - self.assertNotIn(expected_string, rendered_template) + self.assertNotIn("javac -version", rendered_template) + self.assertIn("java -version", rendered_template) def test_version_checker_windows(self): template_name = "partials/version-check-windows.j2"