further entrypoint.sh templating improvements (#627)

adoptium · Aug 7, 2024 · 3af43b4 · 3af43b4
1 parent 1ee3930
commit 3af43b4
Show file tree

Hide file tree

Showing 48 changed files with 12 additions and 235 deletions.
diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubi/ubi9-minimal/entrypoint.sh b/11/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jdk/ubuntu/noble/entrypoint.sh b/11/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/alpine/entrypoint.sh b/11/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubi/ubi9-minimal/entrypoint.sh b/11/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/11/jre/ubuntu/noble/entrypoint.sh b/11/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/alpine/entrypoint.sh b/17/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubi/ubi9-minimal/entrypoint.sh b/17/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jdk/ubuntu/noble/entrypoint.sh b/17/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/alpine/entrypoint.sh b/17/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubi/ubi9-minimal/entrypoint.sh b/17/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/17/jre/ubuntu/noble/entrypoint.sh b/17/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/alpine/entrypoint.sh b/21/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubi/ubi9-minimal/entrypoint.sh b/21/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jdk/ubuntu/noble/entrypoint.sh b/21/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/alpine/entrypoint.sh b/21/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubi/ubi9-minimal/entrypoint.sh b/21/jre/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/21/jre/ubuntu/noble/entrypoint.sh b/21/jre/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jdk/alpine/entrypoint.sh b/22/jdk/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jdk/ubi/ubi9-minimal/entrypoint.sh b/22/jdk/ubi/ubi9-minimal/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jdk/ubuntu/jammy/entrypoint.sh b/22/jdk/ubuntu/jammy/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jdk/ubuntu/noble/entrypoint.sh b/22/jdk/ubuntu/noble/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then
 

diff --git a/22/jre/alpine/entrypoint.sh b/22/jre/alpine/entrypoint.sh
@@ -28,11 +28,6 @@ TMPDIR=${TMPDIR:-/tmp}
 # JDK truststore location
 JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts
 
-# JDK8 puts its JRE in a subdirectory
-if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then
-    JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts
-fi
-
 # Opt-in is only activated if the environment variable is set
 if [ -n "$USE_SYSTEM_CA_CERTS" ]; then