Entrypoint fixes for CA certificates feature (#416)

* Relocate entrypoint script to a less common location This avoids clashing with pre-existing downstream images which have used a custom entrypoint script at e.g. /entrypoint.sh * Use bash as shebang in entrypoint scripts Ref: #415 * Apply suggestions from code review --------- Co-authored-by: George Adams <[email protected]>
adoptium · Aug 14, 2023 · 79157bf · 79157bf
1 parent 05b7f08
commit 79157bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/dockerfile_functions.sh b/dockerfile_functions.sh
@@ -229,7 +229,8 @@ print_alpine_musl_pkg() {
 	cat >> "$1" <<'EOI'
 # fontconfig and ttf-dejavu added to support serverside image generation by Java programs
 # java-cacerts added to support adding CA certificates to the Java keystore
-RUN apk add --no-cache fontconfig java-cacerts libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
+# bash is required for the entrypoint script (s. https://github.com/adoptium/containers/issues/415)
+RUN apk add --no-cache fontconfig java-cacerts bash libretls musl-locales musl-locales-lang ttf-dejavu tzdata zlib \
     && rm -rf /var/cache/apk/*
 EOI
 }
@@ -855,8 +856,8 @@ print_entrypoint() {
     cat "scripts/entrypoint.$2.sh" > "$dir/entrypoint.sh"
     chmod +x "$dir/entrypoint.sh"
     cat >> "$1" <<EOI
-COPY entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh"]
+COPY entrypoint.sh /__cacert_entrypoint.sh
+ENTRYPOINT ["/__cacert_entrypoint.sh"]
 EOI
 }
 

diff --git a/scripts/entrypoint.alpine.sh b/scripts/entrypoint.alpine.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details
 
 set -e
 

diff --git a/scripts/entrypoint.ubi9-minimal.sh b/scripts/entrypoint.ubi9-minimal.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details
 
 set -e