--chmod support for COPY and ADD

adoptium · Aug 6, 2024 · 14a4ea6 · 14a4ea6
1 parent a7957a2
commit 14a4ea6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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' %}
+{% include 'partials/jshell.j2' %}
diff --git 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' %}
+ENTRYPOINT --chmod=755 ["/__cacert_entrypoint.sh"]
+{% include 'partials/jshell.j2' %}
diff --git 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!")