From 3f6f6422017a57eb9ecd31c479c2300e10e73492 Mon Sep 17 00:00:00 2001 From: "shalk(xiao kun)" Date: Tue, 13 Aug 2024 05:37:49 +0800 Subject: [PATCH] --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!")