From 140bbfb26e714be795aca76def3c69011dbfe972 Mon Sep 17 00:00:00 2001 From: "shalk(xiao kun)" Date: Tue, 6 Aug 2024 20:10:45 +0800 Subject: [PATCH 1/4] --chmod support for COPY and ADD Signed-off-by: shalk(xiao kun) --- docker_templates/alpine-linux.Dockerfile.j2 | 2 +- docker_templates/ubi9-minimal.Dockerfile.j2 | 4 ++-- docker_templates/ubuntu.Dockerfile.j2 | 4 ++-- generate_dockerfiles.py | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 41d379279..513f3490d 100644 --- a/docker_templates/alpine-linux.Dockerfile.j2 +++ b/docker_templates/alpine-linux.Dockerfile.j2 @@ -30,6 +30,6 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] {% include 'partials/jshell.j2' %} diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index c8680184d..454d89b06 100644 --- a/docker_templates/ubi9-minimal.Dockerfile.j2 +++ b/docker_templates/ubi9-minimal.Dockerfile.j2 @@ -28,6 +28,6 @@ ENV JAVA_VERSION {{ java_version }} {% include 'partials/multi-arch-install.j2' %} {% include 'partials/version-check.j2' %} -COPY entrypoint.sh /__cacert_entrypoint.sh +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh ENTRYPOINT ["/__cacert_entrypoint.sh"] -{% 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 05dac147a..1167477b8 100644 --- a/docker_templates/ubuntu.Dockerfile.j2 +++ b/docker_templates/ubuntu.Dockerfile.j2 @@ -43,5 +43,5 @@ ENV JAVA_VERSION {{ java_version }} {% 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 +ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +{% include 'partials/jshell.j2' %} diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index d4007cd1d..54e6b7aac 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -187,6 +187,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 80bb9849f1230b6e86978ea8656f05b6dc26e9e2 Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 9 Aug 2024 11:47:01 +0100 Subject: [PATCH 2/4] add generated updates --- 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 92 files changed, 46 insertions(+), 46 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 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..a5ff1fb3d 100644 --- a/11/jdk/ubuntu/focal/Dockerfile +++ b/11/jdk/ubuntu/focal/Dockerfile @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..3273c695e 100644 --- a/11/jdk/ubuntu/jammy/Dockerfile +++ b/11/jdk/ubuntu/jammy/Dockerfile @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..1c2659733 100644 --- a/11/jdk/ubuntu/noble/Dockerfile +++ b/11/jdk/ubuntu/noble/Dockerfile @@ -100,6 +100,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..05dd05882 100644 --- a/11/jre/ubuntu/focal/Dockerfile +++ b/11/jre/ubuntu/focal/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..da6e922d2 100644 --- a/11/jre/ubuntu/jammy/Dockerfile +++ b/11/jre/ubuntu/jammy/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..d7ea8cd10 100644 --- a/11/jre/ubuntu/noble/Dockerfile +++ b/11/jre/ubuntu/noble/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..883eba3ae 100644 --- a/17/jdk/ubuntu/focal/Dockerfile +++ b/17/jdk/ubuntu/focal/Dockerfile @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..9c1e5659d 100644 --- a/17/jdk/ubuntu/jammy/Dockerfile +++ b/17/jdk/ubuntu/jammy/Dockerfile @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..85af0245e 100644 --- a/17/jdk/ubuntu/noble/Dockerfile +++ b/17/jdk/ubuntu/noble/Dockerfile @@ -103,6 +103,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..ca09f57d1 100644 --- a/17/jre/ubuntu/focal/Dockerfile +++ b/17/jre/ubuntu/focal/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..ea23314dc 100644 --- a/17/jre/ubuntu/jammy/Dockerfile +++ b/17/jre/ubuntu/jammy/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..470704dc3 100644 --- a/17/jre/ubuntu/noble/Dockerfile +++ b/17/jre/ubuntu/noble/Dockerfile @@ -98,4 +98,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..c6c47a9e2 100644 --- a/21/jdk/ubuntu/jammy/Dockerfile +++ b/21/jdk/ubuntu/jammy/Dockerfile @@ -99,6 +99,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..34d5ed501 100644 --- a/21/jdk/ubuntu/noble/Dockerfile +++ b/21/jdk/ubuntu/noble/Dockerfile @@ -99,6 +99,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..e742ff7a5 100644 --- a/21/jre/ubuntu/jammy/Dockerfile +++ b/21/jre/ubuntu/jammy/Dockerfile @@ -94,4 +94,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..e4c9aea2e 100644 --- a/21/jre/ubuntu/noble/Dockerfile +++ b/21/jre/ubuntu/noble/Dockerfile @@ -94,4 +94,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..c84a284bb 100644 --- a/22/jdk/ubuntu/jammy/Dockerfile +++ b/22/jdk/ubuntu/jammy/Dockerfile @@ -97,6 +97,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..f14dc616a 100644 --- a/22/jdk/ubuntu/noble/Dockerfile +++ b/22/jdk/ubuntu/noble/Dockerfile @@ -97,6 +97,6 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..0228acd15 100644 --- a/22/jre/ubuntu/jammy/Dockerfile +++ b/22/jre/ubuntu/jammy/Dockerfile @@ -92,4 +92,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..c670d2efd 100644 --- a/22/jre/ubuntu/noble/Dockerfile +++ b/22/jre/ubuntu/noble/Dockerfile @@ -92,4 +92,4 @@ RUN set -eux; \ echo "java --version"; java --version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..ba34423fa 100644 --- a/8/jdk/ubuntu/focal/Dockerfile +++ b/8/jdk/ubuntu/focal/Dockerfile @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..29d2a97f7 100644 --- a/8/jdk/ubuntu/jammy/Dockerfile +++ b/8/jdk/ubuntu/jammy/Dockerfile @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..f5e3abf0c 100644 --- a/8/jdk/ubuntu/noble/Dockerfile +++ b/8/jdk/ubuntu/noble/Dockerfile @@ -96,4 +96,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..9582c86de 100644 --- a/8/jre/ubuntu/focal/Dockerfile +++ b/8/jre/ubuntu/focal/Dockerfile @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..33283f75b 100644 --- a/8/jre/ubuntu/jammy/Dockerfile +++ b/8/jre/ubuntu/jammy/Dockerfile @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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..c792a37c9 100644 --- a/8/jre/ubuntu/noble/Dockerfile +++ b/8/jre/ubuntu/noble/Dockerfile @@ -95,4 +95,4 @@ RUN set -eux; \ echo "java -version"; java -version; \ echo "Complete." COPY entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +ENTRYPOINT --chmod=755 ["/__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 From 6c36dc03eb05038aaf4b59013584511c31bf27fb Mon Sep 17 00:00:00 2001 From: George Adams Date: Fri, 9 Aug 2024 11:53:39 +0100 Subject: [PATCH 3/4] fixup --- 11/jdk/ubuntu/focal/Dockerfile | 4 ++-- 11/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 11/jdk/ubuntu/noble/Dockerfile | 4 ++-- 11/jre/ubuntu/focal/Dockerfile | 4 ++-- 11/jre/ubuntu/jammy/Dockerfile | 4 ++-- 11/jre/ubuntu/noble/Dockerfile | 4 ++-- 17/jdk/ubuntu/focal/Dockerfile | 4 ++-- 17/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 17/jdk/ubuntu/noble/Dockerfile | 4 ++-- 17/jre/ubuntu/focal/Dockerfile | 4 ++-- 17/jre/ubuntu/jammy/Dockerfile | 4 ++-- 17/jre/ubuntu/noble/Dockerfile | 4 ++-- 21/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 21/jdk/ubuntu/noble/Dockerfile | 4 ++-- 21/jre/ubuntu/jammy/Dockerfile | 4 ++-- 21/jre/ubuntu/noble/Dockerfile | 4 ++-- 22/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 22/jdk/ubuntu/noble/Dockerfile | 4 ++-- 22/jre/ubuntu/jammy/Dockerfile | 4 ++-- 22/jre/ubuntu/noble/Dockerfile | 4 ++-- 8/jdk/ubuntu/focal/Dockerfile | 4 ++-- 8/jdk/ubuntu/jammy/Dockerfile | 4 ++-- 8/jdk/ubuntu/noble/Dockerfile | 4 ++-- 8/jre/ubuntu/focal/Dockerfile | 4 ++-- 8/jre/ubuntu/jammy/Dockerfile | 4 ++-- 8/jre/ubuntu/noble/Dockerfile | 4 ++-- docker_templates/alpine-linux.Dockerfile.j2 | 3 +-- docker_templates/partials/entrypoint.j2 | 2 ++ docker_templates/ubi9-minimal.Dockerfile.j2 | 3 +-- docker_templates/ubuntu.Dockerfile.j2 | 3 +-- 30 files changed, 57 insertions(+), 58 deletions(-) create mode 100644 docker_templates/partials/entrypoint.j2 diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile index a5ff1fb3d..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile index 3273c695e..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile index 1c2659733..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/11/jre/ubuntu/focal/Dockerfile b/11/jre/ubuntu/focal/Dockerfile index 05dd05882..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/jammy/Dockerfile b/11/jre/ubuntu/jammy/Dockerfile index da6e922d2..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/11/jre/ubuntu/noble/Dockerfile b/11/jre/ubuntu/noble/Dockerfile index d7ea8cd10..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jdk/ubuntu/focal/Dockerfile b/17/jdk/ubuntu/focal/Dockerfile index 883eba3ae..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/jammy/Dockerfile b/17/jdk/ubuntu/jammy/Dockerfile index 9c1e5659d..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jdk/ubuntu/noble/Dockerfile b/17/jdk/ubuntu/noble/Dockerfile index 85af0245e..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/17/jre/ubuntu/focal/Dockerfile b/17/jre/ubuntu/focal/Dockerfile index ca09f57d1..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/jammy/Dockerfile b/17/jre/ubuntu/jammy/Dockerfile index ea23314dc..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/17/jre/ubuntu/noble/Dockerfile b/17/jre/ubuntu/noble/Dockerfile index 470704dc3..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jdk/ubuntu/jammy/Dockerfile b/21/jdk/ubuntu/jammy/Dockerfile index c6c47a9e2..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jdk/ubuntu/noble/Dockerfile b/21/jdk/ubuntu/noble/Dockerfile index 34d5ed501..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/21/jre/ubuntu/jammy/Dockerfile b/21/jre/ubuntu/jammy/Dockerfile index e742ff7a5..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/21/jre/ubuntu/noble/Dockerfile b/21/jre/ubuntu/noble/Dockerfile index e4c9aea2e..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jdk/ubuntu/jammy/Dockerfile b/22/jdk/ubuntu/jammy/Dockerfile index c84a284bb..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jdk/ubuntu/noble/Dockerfile b/22/jdk/ubuntu/noble/Dockerfile index f14dc616a..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] CMD ["jshell"] diff --git a/22/jre/ubuntu/jammy/Dockerfile b/22/jre/ubuntu/jammy/Dockerfile index 0228acd15..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/22/jre/ubuntu/noble/Dockerfile b/22/jre/ubuntu/noble/Dockerfile index c670d2efd..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/focal/Dockerfile b/8/jdk/ubuntu/focal/Dockerfile index ba34423fa..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/jammy/Dockerfile b/8/jdk/ubuntu/jammy/Dockerfile index 29d2a97f7..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jdk/ubuntu/noble/Dockerfile b/8/jdk/ubuntu/noble/Dockerfile index f5e3abf0c..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/focal/Dockerfile b/8/jre/ubuntu/focal/Dockerfile index 9582c86de..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/jammy/Dockerfile b/8/jre/ubuntu/jammy/Dockerfile index 33283f75b..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/8/jre/ubuntu/noble/Dockerfile b/8/jre/ubuntu/noble/Dockerfile index c792a37c9..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 -ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"] +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] diff --git a/docker_templates/alpine-linux.Dockerfile.j2 b/docker_templates/alpine-linux.Dockerfile.j2 index 513f3490d..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 --chmod=755 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..d5a6bf190 --- /dev/null +++ b/docker_templates/partials/entrypoint.j2 @@ -0,0 +1,2 @@ +COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh +ENTRYPOINT ["/__cacert_entrypoint.sh"] \ No newline at end of file diff --git a/docker_templates/ubi9-minimal.Dockerfile.j2 b/docker_templates/ubi9-minimal.Dockerfile.j2 index 454d89b06..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 --chmod=755 entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %} diff --git a/docker_templates/ubuntu.Dockerfile.j2 b/docker_templates/ubuntu.Dockerfile.j2 index 1167477b8..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 --chmod=755 ["/__cacert_entrypoint.sh"] +{% include 'partials/entrypoint.j2' %} {% include 'partials/jshell.j2' %} From 52707b90b6c863162b43ce2f78f4c4375a978bb6 Mon Sep 17 00:00:00 2001 From: George Adams Date: Mon, 12 Aug 2024 09:35:04 +0100 Subject: [PATCH 4/4] Update entrypoint.j2 --- docker_templates/partials/entrypoint.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_templates/partials/entrypoint.j2 b/docker_templates/partials/entrypoint.j2 index d5a6bf190..ff1f83e9b 100644 --- a/docker_templates/partials/entrypoint.j2 +++ b/docker_templates/partials/entrypoint.j2 @@ -1,2 +1,2 @@ COPY --chmod=755 entrypoint.sh /__cacert_entrypoint.sh -ENTRYPOINT ["/__cacert_entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/__cacert_entrypoint.sh"]