use jinja templating to remove distro specific cases in entrypoint.sh (…

…#616) * use jinja templating to remove distro specific cases in entrypoint.sh * fix shebang logic
adoptium · Jul 29, 2024 · f4e2fe5 · f4e2fe5
1 parent 01c5e99
commit f4e2fe5
Show file tree

Hide file tree

Showing 137 changed files with 1,089 additions and 1,091 deletions.
diff --git a/11/jdk/alpine/Dockerfile b/11/jdk/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh
@@ -1,4 +1,22 @@
 #!/usr/bin/env sh
+# ------------------------------------------------------------------------------
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get
 # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but
 # are supported by `sh` in some Linux flavours.
@@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the
         # system location, for whatever reason.
         if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
-
-            # UBI
-            if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then
-                cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
-            fi
-
-            # Ubuntu/Alpine
-            if [ -d /usr/local/share/ca-certificates/ ]; then
-                cp -La /certificates/* /usr/local/share/ca-certificates/
-            fi
-        fi
-
-        # UBI
-        if command -v update-ca-trust >/dev/null; then
-            update-ca-trust
-        fi
-
-        # Ubuntu/Alpine
-        if command -v update-ca-certificates >/dev/null; then
-            update-ca-certificates
+            cp -La /certificates/* /usr/local/share/ca-certificates/
         fi
+        update-ca-certificates
     else
         # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`,
         # but since the JVM is the primary focus here, we can live with that.

diff --git a/11/jdk/ubi/ubi9-minimal/Dockerfile b/11/jdk/ubi/ubi9-minimal/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -1,4 +1,22 @@
 #!/usr/bin/env sh
+# ------------------------------------------------------------------------------
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get
 # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but
 # are supported by `sh` in some Linux flavours.
@@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the
         # system location, for whatever reason.
         if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
-
-            # UBI
-            if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then
-                cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
-            fi
-
-            # Ubuntu/Alpine
-            if [ -d /usr/local/share/ca-certificates/ ]; then
-                cp -La /certificates/* /usr/local/share/ca-certificates/
-            fi
-        fi
-
-        # UBI
-        if command -v update-ca-trust >/dev/null; then
-            update-ca-trust
-        fi
-
-        # Ubuntu/Alpine
-        if command -v update-ca-certificates >/dev/null; then
-            update-ca-certificates
+            cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
         fi
+        update-ca-trust
     else
         # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`,
         # but since the JVM is the primary focus here, we can live with that.

diff --git a/11/jdk/ubuntu/focal/Dockerfile b/11/jdk/ubuntu/focal/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------
@@ -100,6 +100,6 @@ RUN set -eux; \
     echo "java --version"; java --version; \
     echo "Complete."
 COPY entrypoint.sh /__cacert_entrypoint.sh
-ENTRYPOINT ["/bin/bash", "/__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
@@ -1,4 +1,22 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get
 # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but
 # are supported by `sh` in some Linux flavours.
@@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the
         # system location, for whatever reason.
         if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
-
-            # UBI
-            if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then
-                cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
-            fi
-
-            # Ubuntu/Alpine
-            if [ -d /usr/local/share/ca-certificates/ ]; then
-                cp -La /certificates/* /usr/local/share/ca-certificates/
-            fi
-        fi
-
-        # UBI
-        if command -v update-ca-trust >/dev/null; then
-            update-ca-trust
-        fi
-
-        # Ubuntu/Alpine
-        if command -v update-ca-certificates >/dev/null; then
-            update-ca-certificates
+            cp -La /certificates/* /usr/local/share/ca-certificates/
         fi
+        update-ca-certificates
     else
         # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`,
         # but since the JVM is the primary focus here, we can live with that.

diff --git a/11/jdk/ubuntu/jammy/Dockerfile b/11/jdk/ubuntu/jammy/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------
@@ -100,6 +100,6 @@ RUN set -eux; \
     echo "java --version"; java --version; \
     echo "Complete."
 COPY entrypoint.sh /__cacert_entrypoint.sh
-ENTRYPOINT ["/bin/bash", "/__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
@@ -1,4 +1,22 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get
 # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but
 # are supported by `sh` in some Linux flavours.
@@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the
         # system location, for whatever reason.
         if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
-
-            # UBI
-            if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then
-                cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
-            fi
-
-            # Ubuntu/Alpine
-            if [ -d /usr/local/share/ca-certificates/ ]; then
-                cp -La /certificates/* /usr/local/share/ca-certificates/
-            fi
-        fi
-
-        # UBI
-        if command -v update-ca-trust >/dev/null; then
-            update-ca-trust
-        fi
-
-        # Ubuntu/Alpine
-        if command -v update-ca-certificates >/dev/null; then
-            update-ca-certificates
+            cp -La /certificates/* /usr/local/share/ca-certificates/
         fi
+        update-ca-certificates
     else
         # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`,
         # but since the JVM is the primary focus here, we can live with that.

diff --git a/11/jdk/ubuntu/noble/Dockerfile b/11/jdk/ubuntu/noble/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------
@@ -100,6 +100,6 @@ RUN set -eux; \
     echo "java --version"; java --version; \
     echo "Complete."
 COPY entrypoint.sh /__cacert_entrypoint.sh
-ENTRYPOINT ["/bin/bash", "/__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
@@ -1,4 +1,22 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 # This script defines `sh` as the interpreter, which is available in all POSIX environments. However, it might get
 # started with `bash` as the shell to support dotted.environment.variable.names which are not supported by POSIX, but
 # are supported by `sh` in some Linux flavours.
@@ -75,27 +93,9 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         # The reason why this is not part of the opt-in is because it leaves open the option to mount certificates at the
         # system location, for whatever reason.
         if [ -d /certificates ] && [ "$(ls -A /certificates 2>/dev/null)" ]; then
-
-            # UBI
-            if [ -d /usr/share/pki/ca-trust-source/anchors/ ]; then
-                cp -La /certificates/* /usr/share/pki/ca-trust-source/anchors/
-            fi
-
-            # Ubuntu/Alpine
-            if [ -d /usr/local/share/ca-certificates/ ]; then
-                cp -La /certificates/* /usr/local/share/ca-certificates/
-            fi
-        fi
-
-        # UBI
-        if command -v update-ca-trust >/dev/null; then
-            update-ca-trust
-        fi
-
-        # Ubuntu/Alpine
-        if command -v update-ca-certificates >/dev/null; then
-            update-ca-certificates
+            cp -La /certificates/* /usr/local/share/ca-certificates/
         fi
+        update-ca-certificates
     else
         # If we are not root, we cannot update the system truststore. That's bad news for tools like `curl` and `wget`,
         # but since the JVM is the primary focus here, we can live with that.

diff --git a/11/jdk/windows/nanoserver-1809/Dockerfile b/11/jdk/windows/nanoserver-1809/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jdk/windows/nanoserver-ltsc2022/Dockerfile b/11/jdk/windows/nanoserver-ltsc2022/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jdk/windows/windowsservercore-1809/Dockerfile b/11/jdk/windows/windowsservercore-1809/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile b/11/jdk/windows/windowsservercore-ltsc2022/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------

diff --git a/11/jre/alpine/Dockerfile b/11/jre/alpine/Dockerfile
@@ -1,5 +1,5 @@
 # ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "generate_dockerfiles.py"
+#             NOTE: THIS FILE IS GENERATED VIA "generate_dockerfiles.py"
 #
 #                       PLEASE DO NOT EDIT IT DIRECTLY.
 # ------------------------------------------------------------------------------