entrypoint comment

adoptium · Nov 1, 2023 · 4a71735 · 4a71735
1 parent 6e813ee
commit 4a71735
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 18 deletions.
diff --git a/.test/config.sh b/.test/config.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 imageTests[openjdk]+='
+	dotted-environment-variables
 	java-ca-certificates-update
 '
 

diff --git a/.test/tests/dotted-environment-variables/expected-std-out.txt b/.test/tests/dotted-environment-variables/expected-std-out.txt
@@ -0,0 +1 @@
+variable.with.a.dot=value.foo
diff --git a/.test/tests/dotted-environment-variables/run.sh b/.test/tests/dotted-environment-variables/run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -o pipefail 
+
+CMD1=(env | grep variable.with.a.dot )
+
+# Test run 1: Expect dotted environment variables to be set correctly
+docker run --rm -e "variable.with.a.dot=value.foo" "$1" $CMD1 >&/dev/null
+echo -n $? 
diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"

diff --git a/docker_templates/scripts/entrypoint.alpine-linux.sh b/docker_templates/scripts/entrypoint.alpine-linux.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env sh
 # Converted to shell to avoid the need for bash in the image
 
 set -e
@@ -20,7 +20,8 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
         CACERT="$JAVA_HOME/jre/lib/security/cacerts"
     fi
 
-    # Update CA certificates and extract the trust store
+    # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we
+    # might as well just generate the truststore and skip the hooks.
     update-ca-certificates
 
     trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$CACERT"