From 3f6f6422017a57eb9ecd31c479c2300e10e73492 Mon Sep 17 00:00:00 2001 From: "shalk(xiao kun)" Date: Tue, 13 Aug 2024 05:37:49 +0800 Subject: [PATCH 1/3] --chmod support for COPY and ADD (#624) * --chmod support for COPY and ADD Signed-off-by: shalk(xiao kun) * add generated updates * fixup * Update entrypoint.j2 --------- Signed-off-by: shalk(xiao kun) Co-authored-by: George Adams Co-authored-by: George Adams --- 11/jdk/alpine/Dockerfile | 2 +- 11/jdk/alpine/entrypoint.sh | 0 11/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 11/jdk/ubi/ubi9-minimal/entrypoint.sh | 0 11/jdk/ubuntu/focal/Dockerfile | 2 +- 11/jdk/ubuntu/focal/entrypoint.sh | 0 11/jdk/ubuntu/jammy/Dockerfile | 2 +- 11/jdk/ubuntu/jammy/entrypoint.sh | 0 11/jdk/ubuntu/noble/Dockerfile | 2 +- 11/jdk/ubuntu/noble/entrypoint.sh | 0 11/jre/alpine/Dockerfile | 2 +- 11/jre/alpine/entrypoint.sh | 0 11/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 11/jre/ubi/ubi9-minimal/entrypoint.sh | 0 11/jre/ubuntu/focal/Dockerfile | 2 +- 11/jre/ubuntu/focal/entrypoint.sh | 0 11/jre/ubuntu/jammy/Dockerfile | 2 +- 11/jre/ubuntu/jammy/entrypoint.sh | 0 11/jre/ubuntu/noble/Dockerfile | 2 +- 11/jre/ubuntu/noble/entrypoint.sh | 0 17/jdk/alpine/Dockerfile | 2 +- 17/jdk/alpine/entrypoint.sh | 0 17/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 17/jdk/ubi/ubi9-minimal/entrypoint.sh | 0 17/jdk/ubuntu/focal/Dockerfile | 2 +- 17/jdk/ubuntu/focal/entrypoint.sh | 0 17/jdk/ubuntu/jammy/Dockerfile | 2 +- 17/jdk/ubuntu/jammy/entrypoint.sh | 0 17/jdk/ubuntu/noble/Dockerfile | 2 +- 17/jdk/ubuntu/noble/entrypoint.sh | 0 17/jre/alpine/Dockerfile | 2 +- 17/jre/alpine/entrypoint.sh | 0 17/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 17/jre/ubi/ubi9-minimal/entrypoint.sh | 0 17/jre/ubuntu/focal/Dockerfile | 2 +- 17/jre/ubuntu/focal/entrypoint.sh | 0 17/jre/ubuntu/jammy/Dockerfile | 2 +- 17/jre/ubuntu/jammy/entrypoint.sh | 0 17/jre/ubuntu/noble/Dockerfile | 2 +- 17/jre/ubuntu/noble/entrypoint.sh | 0 21/jdk/alpine/Dockerfile | 2 +- 21/jdk/alpine/entrypoint.sh | 0 21/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 21/jdk/ubi/ubi9-minimal/entrypoint.sh | 0 21/jdk/ubuntu/jammy/Dockerfile | 2 +- 21/jdk/ubuntu/jammy/entrypoint.sh | 0 21/jdk/ubuntu/noble/Dockerfile | 2 +- 21/jdk/ubuntu/noble/entrypoint.sh | 0 21/jre/alpine/Dockerfile | 2 +- 21/jre/alpine/entrypoint.sh | 0 21/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 21/jre/ubi/ubi9-minimal/entrypoint.sh | 0 21/jre/ubuntu/jammy/Dockerfile | 2 +- 21/jre/ubuntu/jammy/entrypoint.sh | 0 21/jre/ubuntu/noble/Dockerfile | 2 +- 21/jre/ubuntu/noble/entrypoint.sh | 0 22/jdk/alpine/Dockerfile | 2 +- 22/jdk/alpine/entrypoint.sh | 0 22/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 22/jdk/ubi/ubi9-minimal/entrypoint.sh | 0 22/jdk/ubuntu/jammy/Dockerfile | 2 +- 22/jdk/ubuntu/jammy/entrypoint.sh | 0 22/jdk/ubuntu/noble/Dockerfile | 2 +- 22/jdk/ubuntu/noble/entrypoint.sh | 0 22/jre/alpine/Dockerfile | 2 +- 22/jre/alpine/entrypoint.sh | 0 22/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 22/jre/ubi/ubi9-minimal/entrypoint.sh | 0 22/jre/ubuntu/jammy/Dockerfile | 2 +- 22/jre/ubuntu/jammy/entrypoint.sh | 0 22/jre/ubuntu/noble/Dockerfile | 2 +- 22/jre/ubuntu/noble/entrypoint.sh | 0 8/jdk/alpine/Dockerfile | 2 +- 8/jdk/alpine/entrypoint.sh | 0 8/jdk/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jdk/ubi/ubi9-minimal/entrypoint.sh | 0 8/jdk/ubuntu/focal/Dockerfile | 2 +- 8/jdk/ubuntu/focal/entrypoint.sh | 0 8/jdk/ubuntu/jammy/Dockerfile | 2 +- 8/jdk/ubuntu/jammy/entrypoint.sh | 0 8/jdk/ubuntu/noble/Dockerfile | 2 +- 8/jdk/ubuntu/noble/entrypoint.sh | 0 8/jre/alpine/Dockerfile | 2 +- 8/jre/alpine/entrypoint.sh | 0 8/jre/ubi/ubi9-minimal/Dockerfile | 2 +- 8/jre/ubi/ubi9-minimal/entrypoint.sh | 0 8/jre/ubuntu/focal/Dockerfile | 2 +- 8/jre/ubuntu/focal/entrypoint.sh | 0 8/jre/ubuntu/jammy/Dockerfile | 2 +- 8/jre/ubuntu/jammy/entrypoint.sh | 0 8/jre/ubuntu/noble/Dockerfile | 2 +- 8/jre/ubuntu/noble/entrypoint.sh | 0 docker_templates/alpine-linux.Dockerfile.j2 | 3 +-- docker_templates/partials/entrypoint.j2 | 2 ++ docker_templates/ubi9-minimal.Dockerfile.j2 | 5 ++--- docker_templates/ubuntu.Dockerfile.j2 | 5 ++--- generate_dockerfiles.py | 1 - 97 files changed, 53 insertions(+), 55 deletions(-) mode change 100755 => 100644 11/jdk/alpine/entrypoint.sh mode change 100755 => 100644 11/jdk/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 11/jdk/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 11/jdk/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 11/jdk/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 11/jre/alpine/entrypoint.sh mode change 100755 => 100644 11/jre/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 11/jre/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 11/jre/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 11/jre/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 17/jdk/alpine/entrypoint.sh mode change 100755 => 100644 17/jdk/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 17/jdk/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 17/jdk/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 17/jdk/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 17/jre/alpine/entrypoint.sh mode change 100755 => 100644 17/jre/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 17/jre/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 17/jre/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 17/jre/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 21/jdk/alpine/entrypoint.sh mode change 100755 => 100644 21/jdk/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 21/jdk/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 21/jdk/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 21/jre/alpine/entrypoint.sh mode change 100755 => 100644 21/jre/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 21/jre/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 21/jre/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 22/jdk/alpine/entrypoint.sh mode change 100755 => 100644 22/jdk/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 22/jdk/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 22/jdk/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 22/jre/alpine/entrypoint.sh mode change 100755 => 100644 22/jre/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 22/jre/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 22/jre/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 8/jdk/alpine/entrypoint.sh mode change 100755 => 100644 8/jdk/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 8/jdk/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 8/jdk/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 8/jdk/ubuntu/noble/entrypoint.sh mode change 100755 => 100644 8/jre/alpine/entrypoint.sh mode change 100755 => 100644 8/jre/ubi/ubi9-minimal/entrypoint.sh mode change 100755 => 100644 8/jre/ubuntu/focal/entrypoint.sh mode change 100755 => 100644 8/jre/ubuntu/jammy/entrypoint.sh mode change 100755 => 100644 8/jre/ubuntu/noble/entrypoint.sh create mode 100644 docker_templates/partials/entrypoint.j2 diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index 6b2dc1b78..11d17051e 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 736333018..19234f36e 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index 7785724f2..26a8d4afe 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index b32ecab9b..07c450d4f 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index dc0797cca..a79c18167 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -99,7 +99,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index f5254041e..00d988f60 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -74,5 +74,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 25a03b51c..0901c8c5b 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -85,5 +85,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index e55c6226a..116018fbf 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index 1438bd97d..aa84b521e 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index e1ecfaed3..5227d1de0 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index b9a1fad7c..0159107d6 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -79,7 +79,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index f084a7057..6455b4687 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index dfcfd223f..d5badb55d 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 132a94f11..f8b8fc4a2 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index f9ef5f4a0..e2b2ec686 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -102,7 +102,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 32554041b..0567846f6 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -74,5 +74,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index 9ccc76d3a..d81a19e9e 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -85,5 +85,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index 2f9f36f23..ca9a85d61 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index b2598c80e..a50ecdce3 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 9cb7a195c..79aaede64 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -97,5 +97,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index 01bae8796..0eda9711f 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 375f97d2e..304e48645 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index 133239fbc..a900185fe 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -98,7 +98,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index 5aae3ad2d..c83c20c41 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -98,7 +98,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 52799021d..4f70ba01c 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -78,5 +78,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index d14d86656..06e96608e 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -85,5 +85,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index a7d00900f..71eab15a2 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -93,5 +93,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index f8b6ac128..2e99f5145 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -93,5 +93,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jdk/alpine/Dockerfile b/22/jdk/alpine/Dockerfile index 5b20df4d8..288193937 100644 --- a/22/jdk/alpine/Dockerfile +++ b/22/jdk/alpine/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jdk/ubi/ubi9-minimal/Dockerfile b/22/jdk/ubi/ubi9-minimal/Dockerfile index fa33c10fa..3f1176658 100644 --- a/22/jdk/ubi/ubi9-minimal/Dockerfile +++ b/22/jdk/ubi/ubi9-minimal/Dockerfile @@ -87,7 +87,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index ec0f33034..d29358fe9 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -96,7 +96,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index 39fce803e..1927ebd54 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -96,7 +96,7 @@ RUN set -eux; \ echo "javac --version"; javac --version; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jre/alpine/Dockerfile b/22/jre/alpine/Dockerfile index f27a32121..33fcb801e 100644 --- a/22/jre/alpine/Dockerfile +++ b/22/jre/alpine/Dockerfile @@ -78,5 +78,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jre/ubi/ubi9-minimal/Dockerfile b/22/jre/ubi/ubi9-minimal/Dockerfile index da209dcac..f65eecaf1 100644 --- a/22/jre/ubi/ubi9-minimal/Dockerfile +++ b/22/jre/ubi/ubi9-minimal/Dockerfile @@ -85,5 +85,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index 46e2cbadd..de9e9f102 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -91,5 +91,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index 1bda68aa5..c097d5e53 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -91,5 +91,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java --version"; java --version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile index 0c5489763..8064687ab 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -75,5 +75,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index 47229398d..e6ba1d81a 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -82,5 +82,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index ff1850935..3e926ec3c 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index c6f272a92..0257bc97f 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index 59ea675c2..3c07738f8 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -95,5 +95,5 @@ RUN set -eux; \ echo "javac -version"; javac -version; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile index c25b62992..d21952e62 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -74,5 +74,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index 2724e6d6b..c1dfab894 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -81,5 +81,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 83c57b899..f60c8af7d 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 1ae8f2c2a..2955bb3cb 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh old mode 100755 new mode 100644 diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index e97bf7008..4ab3b8c26 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -94,5 +94,5 @@ RUN set -eux; \ echo "Verifying install ..."; \ echo "java -version"; java -version; \ echo "Complete." -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh old mode 100755 new mode 100644 diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 41d379279..81d127479 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -30,6 +30,5 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %} diff --git a/docker_templates/partials/entrypoint.j2 b/docker_templates/partials/entrypoint.j2 new file mode 100644 index 000000000..ff1f83e9b --- /dev/null +++ b/docker_templates/partials/entrypoint.j2 @@ -0,0 +1,2 @@ +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index c8680184d..05e6ff267 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -28,6 +28,5 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] -{% include 'partials/jshell.j2' %} \ No newline at end of file +{% include 'partials/entrypoint.j2' %} +{% include 'partials/jshell.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 05dac147a..81f164455 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -42,6 +42,5 @@ ENV JAVA_VERSION {{ java_version }} ldconfig; {% endif %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] -{% include 'partials/jshell.j2' %} \ No newline at end of file +{% include 'partials/entrypoint.j2' %} +{% include 'partials/jshell.j2' %} diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index 280643bed..4576050dd 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -189,6 +189,5 @@ def archHelper(arch, os_name): os.path.join(output_directory, "entrypoint.sh"), "w" ) as out_file: out_file.write(entrypoint) - os.chmod(os.path.join(output_directory, "entrypoint.sh"), 0o755) print("Dockerfiles generated successfully!") From 0327d46f70b892afeaa402a97507a1b103fb84f7 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 13 Aug 2024 09:29:42 +0100 Subject: [PATCH 2/3] remove legacy ENV variables (#628) * remove legacy ENV variables * fix doc generator * simplify --- 11/jdk/alpine/Dockerfile | 6 +++--- 11/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 11/jdk/ubuntu/focal/Dockerfile | 6 +++--- 11/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 11/jdk/ubuntu/noble/Dockerfile | 6 +++--- 11/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 11/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 11/jre/alpine/Dockerfile | 6 +++--- 11/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 11/jre/ubuntu/focal/Dockerfile | 6 +++--- 11/jre/ubuntu/jammy/Dockerfile | 6 +++--- 11/jre/ubuntu/noble/Dockerfile | 6 +++--- 11/jre/windows/nanoserver-1809/Dockerfile | 2 +- 11/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 11/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 11/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jdk/alpine/Dockerfile | 6 +++--- 17/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 17/jdk/ubuntu/focal/Dockerfile | 6 +++--- 17/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 17/jdk/ubuntu/noble/Dockerfile | 6 +++--- 17/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 17/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 17/jre/alpine/Dockerfile | 6 +++--- 17/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 17/jre/ubuntu/focal/Dockerfile | 6 +++--- 17/jre/ubuntu/jammy/Dockerfile | 6 +++--- 17/jre/ubuntu/noble/Dockerfile | 6 +++--- 17/jre/windows/nanoserver-1809/Dockerfile | 2 +- 17/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 17/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 17/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jdk/alpine/Dockerfile | 6 +++--- 21/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 21/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 21/jdk/ubuntu/noble/Dockerfile | 6 +++--- 21/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 21/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 21/jre/alpine/Dockerfile | 6 +++--- 21/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 21/jre/ubuntu/jammy/Dockerfile | 6 +++--- 21/jre/ubuntu/noble/Dockerfile | 6 +++--- 21/jre/windows/nanoserver-1809/Dockerfile | 2 +- 21/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 21/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 21/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jdk/alpine/Dockerfile | 6 +++--- 22/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 22/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 22/jdk/ubuntu/noble/Dockerfile | 6 +++--- 22/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 22/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 22/jre/alpine/Dockerfile | 6 +++--- 22/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 22/jre/ubuntu/jammy/Dockerfile | 6 +++--- 22/jre/ubuntu/noble/Dockerfile | 6 +++--- 22/jre/windows/nanoserver-1809/Dockerfile | 2 +- 22/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 22/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 22/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jdk/alpine/Dockerfile | 6 +++--- 8/jdk/ubi/ubi9-minimal/Dockerfile | 6 +++--- 8/jdk/ubuntu/focal/Dockerfile | 6 +++--- 8/jdk/ubuntu/jammy/Dockerfile | 6 +++--- 8/jdk/ubuntu/noble/Dockerfile | 6 +++--- 8/jdk/windows/nanoserver-1809/Dockerfile | 2 +- 8/jdk/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jdk/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- 8/jre/alpine/Dockerfile | 6 +++--- 8/jre/ubi/ubi9-minimal/Dockerfile | 6 +++--- 8/jre/ubuntu/focal/Dockerfile | 6 +++--- 8/jre/ubuntu/jammy/Dockerfile | 6 +++--- 8/jre/ubuntu/noble/Dockerfile | 6 +++--- 8/jre/windows/nanoserver-1809/Dockerfile | 2 +- 8/jre/windows/nanoserver-ltsc2022/Dockerfile | 2 +- 8/jre/windows/windowsservercore-1809/Dockerfile | 2 +- 8/jre/windows/windowsservercore-ltsc2022/Dockerfile | 2 +- docker_templates/alpine-linux.Dockerfile.j2 | 2 +- docker_templates/nanoserver.Dockerfile.j2 | 2 +- docker_templates/partials/java-version.j2 | 1 + docker_templates/partials/nix-env.j2 | 4 ++-- docker_templates/servercore.Dockerfile.j2 | 2 +- docker_templates/ubi9-minimal.Dockerfile.j2 | 2 +- docker_templates/ubuntu.Dockerfile.j2 | 2 +- dockerhub_doc_config_update.sh | 2 +- 94 files changed, 187 insertions(+), 186 deletions(-) create mode 100644 docker_templates/partials/java-version.j2 diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile index 11d17051e..27e8199c7 100644 --- a/11/jdk/alpine/Dockerfile +++ b/11/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile index 19234f36e..0f15df108 100644 --- a/11/jdk/ubi/ubi9-minimal/Dockerfile +++ b/11/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index 26a8d4afe..74465eca0 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 07c450d4f..d0ec5629f 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index a79c18167..7e5d440b6 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile index 4b08d43a5..d0f9578c3 100644 --- a/11/jdk/windows/nanoserver-1809/Dockerfile +++ b/11/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile index c50508130..68ed2b16b 100644 --- a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile b/11/jdk/windows/windowsservercore-1809/Dockerfile index 0cde96461..707c52573 100644 --- a/11/jdk/windows/windowsservercore-1809/Dockerfile +++ b/11/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 75cf96a7e..e21fbf875 100644 --- a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jdk_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile index 00d988f60..3b8aa07cb 100644 --- a/11/jre/alpine/Dockerfile +++ b/11/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/11/jre/ubi/ubi9-minimal/Dockerfile b/11/jre/ubi/ubi9-minimal/Dockerfile index 0901c8c5b..0d3549013 100644 --- a/11/jre/ubi/ubi9-minimal/Dockerfile +++ b/11/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 116018fbf..45260facb 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index aa84b521e..cb0babbeb 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index 5227d1de0..79e18b57a 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/11/jre/windows/nanoserver-1809/Dockerfile b/11/jre/windows/nanoserver-1809/Dockerfile index ebd8f4c6c..14a0961c2 100644 --- a/11/jre/windows/nanoserver-1809/Dockerfile +++ b/11/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jre/windows/nanoserver-ltsc2022/Dockerfile b/11/jre/windows/nanoserver-ltsc2022/Dockerfile index b45eb7ef1..00f5409cd 100644 --- a/11/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/11/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 ENV JAVA_HOME C:\\openjdk-11 # "ERROR: Access to the registry path is denied." diff --git a/11/jre/windows/windowsservercore-1809/Dockerfile b/11/jre/windows/windowsservercore-1809/Dockerfile index 880ee7662..5d04cb2f4 100644 --- a/11/jre/windows/windowsservercore-1809/Dockerfile +++ b/11/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile index 8b83a3f61..0bfb2acbc 100644 --- a/11/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/11/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-11.0.24+8 +ENV JAVA_VERSION=jdk-11.0.24+8 RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.24%2B8/OpenJDK11U-jre_x64_windows_hotspot_11.0.24_8.msi ; \ diff --git a/17/jdk/alpine/Dockerfile b/17/jdk/alpine/Dockerfile index 0159107d6..cd77a10a1 100644 --- a/17/jdk/alpine/Dockerfile +++ b/17/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/17/jdk/ubi/ubi9-minimal/Dockerfile b/17/jdk/ubi/ubi9-minimal/Dockerfile index 6455b4687..98a559ac9 100644 --- a/17/jdk/ubi/ubi9-minimal/Dockerfile +++ b/17/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index d5badb55d..03fa063a1 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index f8b8fc4a2..8c8bec57e 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index e2b2ec686..f291d4bee 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jdk/windows/nanoserver-1809/Dockerfile b/17/jdk/windows/nanoserver-1809/Dockerfile index 4f6d21e53..4e86ec4ef 100644 --- a/17/jdk/windows/nanoserver-1809/Dockerfile +++ b/17/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile index 8d0bfa294..be1c2e278 100644 --- a/17/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jdk/windows/windowsservercore-1809/Dockerfile b/17/jdk/windows/windowsservercore-1809/Dockerfile index 1826e2d59..efdcdc036 100644 --- a/17/jdk/windows/windowsservercore-1809/Dockerfile +++ b/17/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile index a152fef82..8d98eafd6 100644 --- a/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jre/alpine/Dockerfile b/17/jre/alpine/Dockerfile index 0567846f6..f0479b51c 100644 --- a/17/jre/alpine/Dockerfile +++ b/17/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/17/jre/ubi/ubi9-minimal/Dockerfile b/17/jre/ubi/ubi9-minimal/Dockerfile index d81a19e9e..8d863131c 100644 --- a/17/jre/ubi/ubi9-minimal/Dockerfile +++ b/17/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index ca9a85d61..70027ca9e 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index a50ecdce3..59369575a 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 79aaede64..700008b12 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/17/jre/windows/nanoserver-1809/Dockerfile b/17/jre/windows/nanoserver-1809/Dockerfile index 6a7ea9cad..ad4d7502d 100644 --- a/17/jre/windows/nanoserver-1809/Dockerfile +++ b/17/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jre/windows/nanoserver-ltsc2022/Dockerfile b/17/jre/windows/nanoserver-ltsc2022/Dockerfile index 345d14587..30eba22aa 100644 --- a/17/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/17/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 ENV JAVA_HOME C:\\openjdk-17 # "ERROR: Access to the registry path is denied." diff --git a/17/jre/windows/windowsservercore-1809/Dockerfile b/17/jre/windows/windowsservercore-1809/Dockerfile index 25eb6e4a4..da8c3afa5 100644 --- a/17/jre/windows/windowsservercore-1809/Dockerfile +++ b/17/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile index b2978d704..f6086c28e 100644 --- a/17/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/17/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-17.0.12+7 +ENV JAVA_VERSION=jdk-17.0.12+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_x64_windows_hotspot_17.0.12_7.msi ; \ diff --git a/21/jdk/alpine/Dockerfile b/21/jdk/alpine/Dockerfile index 0eda9711f..c62668a9d 100644 --- a/21/jdk/alpine/Dockerfile +++ b/21/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/21/jdk/ubi/ubi9-minimal/Dockerfile b/21/jdk/ubi/ubi9-minimal/Dockerfile index 304e48645..2f6562a06 100644 --- a/21/jdk/ubi/ubi9-minimal/Dockerfile +++ b/21/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index a900185fe..061af25e8 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index c83c20c41..5408fe13b 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -49,7 +49,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jdk/windows/nanoserver-1809/Dockerfile b/21/jdk/windows/nanoserver-1809/Dockerfile index f14440fad..c86f7fb1e 100644 --- a/21/jdk/windows/nanoserver-1809/Dockerfile +++ b/21/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile index ad58ac7d8..5408206ba 100644 --- a/21/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jdk/windows/windowsservercore-1809/Dockerfile b/21/jdk/windows/windowsservercore-1809/Dockerfile index f645044a9..a02936f60 100644 --- a/21/jdk/windows/windowsservercore-1809/Dockerfile +++ b/21/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 0b89e1517..a2eb3883f 100644 --- a/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jre/alpine/Dockerfile b/21/jre/alpine/Dockerfile index 4f70ba01c..ea62602d2 100644 --- a/21/jre/alpine/Dockerfile +++ b/21/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/21/jre/ubi/ubi9-minimal/Dockerfile b/21/jre/ubi/ubi9-minimal/Dockerfile index 06e96608e..f27213f79 100644 --- a/21/jre/ubi/ubi9-minimal/Dockerfile +++ b/21/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index 71eab15a2..1671feaaf 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index 2e99f5145..1ccb0c626 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/21/jre/windows/nanoserver-1809/Dockerfile b/21/jre/windows/nanoserver-1809/Dockerfile index 849fe8119..b20591f89 100644 --- a/21/jre/windows/nanoserver-1809/Dockerfile +++ b/21/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jre/windows/nanoserver-ltsc2022/Dockerfile b/21/jre/windows/nanoserver-ltsc2022/Dockerfile index 78481dd3c..1c19caae6 100644 --- a/21/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/21/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 ENV JAVA_HOME C:\\openjdk-21 # "ERROR: Access to the registry path is denied." diff --git a/21/jre/windows/windowsservercore-1809/Dockerfile b/21/jre/windows/windowsservercore-1809/Dockerfile index da8e75495..222455d23 100644 --- a/21/jre/windows/windowsservercore-1809/Dockerfile +++ b/21/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile index 8b03a818b..25cb3afb6 100644 --- a/21/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/21/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-21.0.4+7 +ENV JAVA_VERSION=jdk-21.0.4+7 RUN Write-Host ('Downloading https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_windows_hotspot_21.0.4_7.msi ; \ diff --git a/22/jdk/alpine/Dockerfile b/22/jdk/alpine/Dockerfile index 288193937..2086669c5 100644 --- a/22/jdk/alpine/Dockerfile +++ b/22/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -48,7 +48,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/22/jdk/ubi/ubi9-minimal/Dockerfile b/22/jdk/ubi/ubi9-minimal/Dockerfile index 3f1176658..ffe29b273 100644 --- a/22/jdk/ubi/ubi9-minimal/Dockerfile +++ b/22/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index d29358fe9..f518473c2 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -47,7 +47,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index 1927ebd54..2192262ad 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -47,7 +47,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jdk/windows/nanoserver-1809/Dockerfile b/22/jdk/windows/nanoserver-1809/Dockerfile index a5d4e09ba..46c9515dd 100644 --- a/22/jdk/windows/nanoserver-1809/Dockerfile +++ b/22/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile index 9bb8993c3..36788c34c 100644 --- a/22/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jdk/windows/windowsservercore-1809/Dockerfile b/22/jdk/windows/windowsservercore-1809/Dockerfile index 7aca8f36e..503d25f16 100644 --- a/22/jdk/windows/windowsservercore-1809/Dockerfile +++ b/22/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile index c5a441539..2ba0b5695 100644 --- a/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jre/alpine/Dockerfile b/22/jre/alpine/Dockerfile index 33fcb801e..600d752ef 100644 --- a/22/jre/alpine/Dockerfile +++ b/22/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/22/jre/ubi/ubi9-minimal/Dockerfile b/22/jre/ubi/ubi9-minimal/Dockerfile index f65eecaf1..6683f5183 100644 --- a/22/jre/ubi/ubi9-minimal/Dockerfile +++ b/22/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index de9e9f102..16affc3f9 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index c097d5e53..9b9b4fe92 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/22/jre/windows/nanoserver-1809/Dockerfile b/22/jre/windows/nanoserver-1809/Dockerfile index 22201ab09..08888ab21 100644 --- a/22/jre/windows/nanoserver-1809/Dockerfile +++ b/22/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jre/windows/nanoserver-ltsc2022/Dockerfile b/22/jre/windows/nanoserver-ltsc2022/Dockerfile index 4a8d37113..e704f7396 100644 --- a/22/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/22/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 ENV JAVA_HOME C:\\openjdk-22 # "ERROR: Access to the registry path is denied." diff --git a/22/jre/windows/windowsservercore-1809/Dockerfile b/22/jre/windows/windowsservercore-1809/Dockerfile index 8e6ff35f2..2e9753b40 100644 --- a/22/jre/windows/windowsservercore-1809/Dockerfile +++ b/22/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile index 9785d07d0..1c993c1c0 100644 --- a/22/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/22/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk-22.0.2+9 +ENV JAVA_VERSION=jdk-22.0.2+9 RUN Write-Host ('Downloading https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_x64_windows_hotspot_22.0.2_9.msi ; \ diff --git a/8/jdk/alpine/Dockerfile b/8/jdk/alpine/Dockerfile index 8064687ab..649eba723 100644 --- a/8/jdk/alpine/Dockerfile +++ b/8/jdk/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/8/jdk/ubi/ubi9-minimal/Dockerfile b/8/jdk/ubi/ubi9-minimal/Dockerfile index e6ba1d81a..57a87552d 100644 --- a/8/jdk/ubi/ubi9-minimal/Dockerfile +++ b/8/jdk/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index 3e926ec3c..e02ea2686 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 0257bc97f..74ed4321d 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index 3c07738f8..a9794a129 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jdk/windows/nanoserver-1809/Dockerfile b/8/jdk/windows/nanoserver-1809/Dockerfile index 850540eba..f5069d5ee 100644 --- a/8/jdk/windows/nanoserver-1809/Dockerfile +++ b/8/jdk/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile index 69424d228..6933b6e79 100644 --- a/8/jdk/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jdk/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jdk/windows/windowsservercore-1809/Dockerfile b/8/jdk/windows/windowsservercore-1809/Dockerfile index 48e9d9b4b..d6feaeb4b 100644 --- a/8/jdk/windows/windowsservercore-1809/Dockerfile +++ b/8/jdk/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile index 50f75fd22..c4ae0cd7c 100644 --- a/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jdk/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jdk_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jre/alpine/Dockerfile b/8/jre/alpine/Dockerfile index d21952e62..e0daf20ee 100644 --- a/8/jre/alpine/Dockerfile +++ b/8/jre/alpine/Dockerfile @@ -19,8 +19,8 @@ FROM alpine:3.20 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -45,7 +45,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(apk --print-arch)"; \ diff --git a/8/jre/ubi/ubi9-minimal/Dockerfile b/8/jre/ubi/ubi9-minimal/Dockerfile index c1dfab894..ba1941edc 100644 --- a/8/jre/ubi/ubi9-minimal/Dockerfile +++ b/8/jre/ubi/ubi9-minimal/Dockerfile @@ -19,8 +19,8 @@ FROM redhat/ubi9-minimal -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -44,7 +44,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index f60c8af7d..6e503892a 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:20.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 2955bb3cb..e2a00c83f 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:22.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index 4ab3b8c26..b068a2478 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -19,8 +19,8 @@ FROM ubuntu:24.04 -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' @@ -46,7 +46,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ diff --git a/8/jre/windows/nanoserver-1809/Dockerfile b/8/jre/windows/nanoserver-1809/Dockerfile index 958458754..beeb0644d 100644 --- a/8/jre/windows/nanoserver-1809/Dockerfile +++ b/8/jre/windows/nanoserver-1809/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:1809 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jre/windows/nanoserver-ltsc2022/Dockerfile b/8/jre/windows/nanoserver-ltsc2022/Dockerfile index dd1f96704..9ea4aa23b 100644 --- a/8/jre/windows/nanoserver-ltsc2022/Dockerfile +++ b/8/jre/windows/nanoserver-ltsc2022/Dockerfile @@ -21,7 +21,7 @@ FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 ENV JAVA_HOME C:\\openjdk-8 # "ERROR: Access to the registry path is denied." diff --git a/8/jre/windows/windowsservercore-1809/Dockerfile b/8/jre/windows/windowsservercore-1809/Dockerfile index e7dc705ca..93c4c4f41 100644 --- a/8/jre/windows/windowsservercore-1809/Dockerfile +++ b/8/jre/windows/windowsservercore-1809/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:1809 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile index a8a82d8ea..096ccd558 100644 --- a/8/jre/windows/windowsservercore-ltsc2022/Dockerfile +++ b/8/jre/windows/windowsservercore-ltsc2022/Dockerfile @@ -22,7 +22,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION jdk8u422-b05 +ENV JAVA_VERSION=jdk8u422-b05 RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ...'); \ curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u422-b05/OpenJDK8U-jre_x64_windows_hotspot_8u422b05.msi ; \ diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 81d127479..816c4a690 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -25,7 +25,7 @@ RUN set -eux; \ ; \ rm -rf /var/cache/apk/* -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} diff --git a/docker_templates/nanoserver.Dockerfile.j2 b/docker_templates/nanoserver.Dockerfile.j2 index 7341568bc..15a10abb5 100644 --- a/docker_templates/nanoserver.Dockerfile.j2 +++ b/docker_templates/nanoserver.Dockerfile.j2 @@ -4,7 +4,7 @@ FROM {{ base_image }} SHELL ["cmd", "/s", "/c"] -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} ENV JAVA_HOME C:\\openjdk-{{ version }} # "ERROR: Access to the registry path is denied." diff --git a/docker_templates/partials/java-version.j2 b/docker_templates/partials/java-version.j2 new file mode 100644 index 000000000..8f66e6acd --- /dev/null +++ b/docker_templates/partials/java-version.j2 @@ -0,0 +1 @@ +ENV JAVA_VERSION={{ java_version }} \ No newline at end of file diff --git a/docker_templates/partials/nix-env.j2 b/docker_templates/partials/nix-env.j2 index 3a8a7e247..0d19c9841 100644 --- a/docker_templates/partials/nix-env.j2 +++ b/docker_templates/partials/nix-env.j2 @@ -1,5 +1,5 @@ -ENV JAVA_HOME /opt/java/openjdk -ENV PATH $JAVA_HOME/bin:$PATH +ENV JAVA_HOME=/opt/java/openjdk +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' diff --git a/docker_templates/servercore.Dockerfile.j2 b/docker_templates/servercore.Dockerfile.j2 index 45d0e6d83..56521ab75 100644 --- a/docker_templates/servercore.Dockerfile.j2 +++ b/docker_templates/servercore.Dockerfile.j2 @@ -5,7 +5,7 @@ FROM {{ base_image }} # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} RUN Write-Host ('Downloading {{ arch_data.download_url }} ...'); \ curl.exe -LfsSo openjdk.msi {{ arch_data.download_url }} ; \ diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index 05e6ff267..2abba479b 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -23,7 +23,7 @@ RUN set -eux; \ ; \ microdnf clean all -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 81f164455..68534423b 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -28,7 +28,7 @@ RUN set -eux; \ locale-gen en_US.UTF-8; \ rm -rf /var/lib/apt/lists/* -ENV JAVA_VERSION {{ java_version }} +{% include 'partials/java-version.j2' %} {% include 'partials/multi-arch-install.j2' %} \ # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472 diff --git a/dockerhub_doc_config_update.sh b/dockerhub_doc_config_update.sh index 1f63a91e0..60f7044ef 100755 --- a/dockerhub_doc_config_update.sh +++ b/dockerhub_doc_config_update.sh @@ -63,7 +63,7 @@ print_official_header() { function generate_official_image_tags() { # Generate the tags - full_version=$(grep "VERSION" "${file}" | awk '{ print $3 }') + full_version=$(grep "JAVA_VERSION=" "${file}" | awk -F '=' '{ print $2 }') # Remove any `jdk` references in the version ojdk_version=$(echo "${full_version}" | sed 's/\(jdk-\)//;s/\(jdk\)//' | awk -F '_' '{ print $1 }') From f56f55b60b71365e19fb25b00f3143350e9bf9cf Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 13 Aug 2024 09:35:55 +0100 Subject: [PATCH 3/3] jinja refactoring and more test coverage (#629) --- .github/workflows/code-freeze.yml | 3 + docker_templates/alpine-linux.Dockerfile.j2 | 2 +- docker_templates/nanoserver.Dockerfile.j2 | 2 +- docker_templates/partials/arch-variable.j2 | 2 +- docker_templates/partials/binutils.j2 | 4 +- .../partials/multi-arch-install.j2 | 2 +- .../partials/version-check-windows.j2 | 2 +- docker_templates/partials/version-check.j2 | 2 +- docker_templates/servercore.Dockerfile.j2 | 2 +- docker_templates/ubuntu.Dockerfile.j2 | 2 +- test_generate_dockerfiles.py | 75 +++++++++++++++++++ 11 files changed, 88 insertions(+), 10 deletions(-) diff --git a/.github/workflows/code-freeze.yml b/.github/workflows/code-freeze.yml index f14e3ad89..8f9f79e46 100644 --- a/.github/workflows/code-freeze.yml +++ b/.github/workflows/code-freeze.yml @@ -33,6 +33,9 @@ jobs: # Code freeze if branch-regex matches codefreeze_if_branch_match: + permissions: + contents: write + pull-requests: write needs: codefreeze_branch_check uses: adoptium/.github/.github/workflows/code-freeze.yml@main if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && needs.codefreeze_branch_check.outputs.regex-matches == 'true' diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 816c4a690..9344dd20f 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -15,7 +15,7 @@ RUN set -eux; \ ca-certificates p11-kit-trust \ # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 musl-locales musl-locales-lang \ -{% include 'partials/binutils.j2' -%} + {%- include 'partials/binutils.j2' %} tzdata \ # Contains `csplit` used for splitting multiple certificates in one file to multiple files, since keytool can # only import one at a time. diff --git a/docker_templates/nanoserver.Dockerfile.j2 b/docker_templates/nanoserver.Dockerfile.j2 index 15a10abb5..31be40987 100644 --- a/docker_templates/nanoserver.Dockerfile.j2 +++ b/docker_templates/nanoserver.Dockerfile.j2 @@ -22,4 +22,4 @@ RUN echo Verifying install ... \ {% endif -%} && echo java {% if version|int >= 11 %}--{% else %}-{% endif %}version && java {% if version|int >= 11 %}--{% else %}-{% endif %}version \ && echo Complete. -{% include 'partials/jshell.j2' %} \ No newline at end of file +{% include 'partials/jshell.j2' %} diff --git a/docker_templates/partials/arch-variable.j2 b/docker_templates/partials/arch-variable.j2 index b40f728de..9e32b5848 100644 --- a/docker_templates/partials/arch-variable.j2 +++ b/docker_templates/partials/arch-variable.j2 @@ -4,4 +4,4 @@ ARCH="$(apk --print-arch)"; \ {%- elif os == "ubi9-minimal" %} ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)"; \ -{%- endif -%} \ No newline at end of file +{%- endif -%} diff --git a/docker_templates/partials/binutils.j2 b/docker_templates/partials/binutils.j2 index d81e9ce8c..b4b7872d0 100644 --- a/docker_templates/partials/binutils.j2 +++ b/docker_templates/partials/binutils.j2 @@ -1,5 +1,5 @@ - {% if image_type == "jdk" and version|int >= 13 -%} +{% if image_type == "jdk" and 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 -%} +{%- endif -%} diff --git a/docker_templates/partials/multi-arch-install.j2 b/docker_templates/partials/multi-arch-install.j2 index 5ad1f5bb0..4f8a9e6a0 100644 --- a/docker_templates/partials/multi-arch-install.j2 +++ b/docker_templates/partials/multi-arch-install.j2 @@ -27,4 +27,4 @@ RUN set -eux; \ --strip-components 1 \ --no-same-owner \ ; \ - rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; \ No newline at end of file + rm -f /tmp/openjdk.tar.gz ${JAVA_HOME}/lib/src.zip; diff --git a/docker_templates/partials/version-check-windows.j2 b/docker_templates/partials/version-check-windows.j2 index fa4c2daac..3c0df1f4f 100644 --- a/docker_templates/partials/version-check-windows.j2 +++ b/docker_templates/partials/version-check-windows.j2 @@ -4,4 +4,4 @@ RUN Write-Host 'Verifying install ...'; \ {% endif -%} Write-Host 'java {% if version|int >= 11 %}--{% else %}-{% endif %}version'; java {% if version|int >= 11 %}--{% else %}-{% endif %}version; \ \ - Write-Host 'Complete.' \ No newline at end of file + Write-Host 'Complete.' diff --git a/docker_templates/partials/version-check.j2 b/docker_templates/partials/version-check.j2 index 50afca768..d019ebd99 100644 --- a/docker_templates/partials/version-check.j2 +++ b/docker_templates/partials/version-check.j2 @@ -7,4 +7,4 @@ RUN set -eux; \ 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 "Complete." \ No newline at end of file + echo "Complete." diff --git a/docker_templates/servercore.Dockerfile.j2 b/docker_templates/servercore.Dockerfile.j2 index 56521ab75..926980255 100644 --- a/docker_templates/servercore.Dockerfile.j2 +++ b/docker_templates/servercore.Dockerfile.j2 @@ -31,4 +31,4 @@ RUN Write-Host ('Downloading {{ arch_data.download_url }} ...'); \ Remove-Item openjdk.msi -Force {% include 'partials/version-check-windows.j2' %} -{% include 'partials/jshell.j2' %} \ No newline at end of file +{% include 'partials/jshell.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 68534423b..f5c13653a 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -19,7 +19,7 @@ RUN set -eux; \ # utilities for keeping Ubuntu and OpenJDK CA certificates in sync # https://github.com/adoptium/containers/issues/293 ca-certificates p11-kit \ -{% include 'partials/binutils.j2' -%} + {%- include 'partials/binutils.j2' %} tzdata \ # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8 locales \ diff --git a/test_generate_dockerfiles.py b/test_generate_dockerfiles.py index 2e2f0b72e..8a8f32e18 100644 --- a/test_generate_dockerfiles.py +++ b/test_generate_dockerfiles.py @@ -157,6 +157,81 @@ def test_jdk11plus_jshell_cmd(self): expected_string = 'CMD ["jshell"]' self.assertNotIn(expected_string, rendered_template) + def test_binutils_inclusion(self): + template_name = "ubuntu.Dockerfile.j2" + template = self.env.get_template(template_name) + + # Binutils should be included for jdk images with version >= 13 + with self.subTest("jdk 13+ should include binutils"): + context = { + "version": 13, + "image_type": "jdk", + "os": "ubuntu", + "arch_data": {}, + } + rendered_template = template.render(**context) + self.assertIn("binutils", rendered_template) + + # Binutils should not be included for jre images regardless of version + with self.subTest("jre 13+ should not include binutils"): + context = { + "version": 13, + "image_type": "jre", + "os": "ubuntu", + "arch_data": {}, + } + rendered_template = template.render(**context) + self.assertNotIn("binutils", rendered_template) + + # Binutils should not be included for jdk images with version < 13 + with self.subTest("jdk < 13 should not include binutils"): + context = { + "version": 12, + "image_type": "jdk", + "os": "ubuntu", + "arch_data": {}, + } + rendered_template = template.render(**context) + self.assertNotIn("binutils", rendered_template) + + def test_arch_data_population(self): + template_name = "ubuntu.Dockerfile.j2" + template = self.env.get_template(template_name) + + # Simulate API response + arch_data = { + "amd64": { + "download_url": "http://fake-url.com", + "checksum": "fake-checksum", + } + } + + context = { + "version": 11, + "image_type": "jdk", + "os": "ubuntu", + "arch_data": arch_data, + } + rendered_template = template.render(**context) + + self.assertIn("http://fake-url.com", rendered_template) + self.assertIn("fake-checksum", rendered_template) + + def test_entrypoint_rendering(self): + template_name = "entrypoint.sh.j2" + template = self.env.get_template(template_name) + + context = { + "image_type": "jdk", + "os": "ubuntu", + "version": 11, + } + rendered_template = template.render(**context) + + # Ensure that the entrypoint script contains expected commands + self.assertIn("update-ca-certificates", rendered_template) + self.assertIn("exec \"$@\"", rendered_template) + if __name__ == "__main__": unittest.main()