From e669537588415d0d0ab00e7d9ac456ec0a6d2d69 Mon Sep 17 00:00:00 2001
From: eclipse-temurin-bot
<81643974+eclipse-temurin-bot@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:42:37 +0200
Subject: [PATCH] dockerfile: automated nightly updates (#455)
---
8/jdk/alpine/Dockerfile | 46 +++++++++++++++++++++--------------------
8/jre/alpine/Dockerfile | 44 ++++++++++++++++++++-------------------
2 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile
index b7782df07..b7a905b41 100644
--- a/8/jdk/alpine/Dockerfile
+++ b/8/jdk/alpine/Dockerfile
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
# ------------------------------------------------------------------------------
@@ -25,40 +25,42 @@ 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 jdk8u382-b05
+ENV JAVA_VERSION jdk8u392-b08
RUN set -eux; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
amd64|x86_64) \
- ESUM='6cf2d4925c387c4cdc0bf2e71de3690527141b5244695d0b3109ce83a8512235'; \
- BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u382b05.tar.gz'; \
+ ESUM='8dcb1532a1194afa06e4b5ace4e9e279926392442bf46b2d51b49ae1a9a1dfea'; \
+ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u392b08.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
exit 1; \
;; \
esac; \
- wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
- echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
- mkdir -p "$JAVA_HOME"; \
- tar --extract \
- --file /tmp/openjdk.tar.gz \
- --directory "$JAVA_HOME" \
- --strip-components 1 \
- --no-same-owner \
- ; \
+ wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p "$JAVA_HOME"; \
+ tar --extract \
+ --file /tmp/openjdk.tar.gz \
+ --directory "$JAVA_HOME" \
+ --strip-components 1 \
+ --no-same-owner \
+ ; \
rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
-RUN echo Verifying install ... \
- && 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/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile
index f7d4bc4c2..ff78ff598 100644
--- a/8/jre/alpine/Dockerfile
+++ b/8/jre/alpine/Dockerfile
@@ -1,5 +1,5 @@
# ------------------------------------------------------------------------------
-# NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
#
# PLEASE DO NOT EDIT IT DIRECTLY.
# ------------------------------------------------------------------------------
@@ -25,39 +25,41 @@ 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 jdk8u382-b05
+ENV JAVA_VERSION jdk8u392-b08
RUN set -eux; \
ARCH="$(apk --print-arch)"; \
case "${ARCH}" in \
amd64|x86_64) \
- ESUM='7040d865493f13204194c5a1add63e22516b1fa4481264baa6a5b2614a275a0e'; \
- BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u382-b05/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u382b05.tar.gz'; \
+ ESUM='3c99efbcbc481eadda6f3d42733fd33156d08b702f8198de08d2e34dfd43e22e'; \
+ BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u392-b08/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u392b08.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
exit 1; \
;; \
esac; \
- wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
- echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
- mkdir -p "$JAVA_HOME"; \
- tar --extract \
- --file /tmp/openjdk.tar.gz \
- --directory "$JAVA_HOME" \
- --strip-components 1 \
- --no-same-owner \
- ; \
+ wget -O /tmp/openjdk.tar.gz ${BINARY_URL}; \
+ echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+ mkdir -p "$JAVA_HOME"; \
+ tar --extract \
+ --file /tmp/openjdk.tar.gz \
+ --directory "$JAVA_HOME" \
+ --strip-components 1 \
+ --no-same-owner \
+ ; \
rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip;
-RUN echo Verifying install ... \
- && 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"]