From 498fb5bbb81dfe6cabd57bb0ced6cd1e7229a272 Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 7 Aug 2024 13:30:11 +0100 Subject: [PATCH 1/2] further entrypoint.sh templating improvements --- 11/jdk/alpine/entrypoint.sh | 5 ----- 11/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 11/jdk/ubuntu/focal/entrypoint.sh | 5 ----- 11/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 11/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 11/jre/alpine/entrypoint.sh | 5 ----- 11/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 11/jre/ubuntu/focal/entrypoint.sh | 5 ----- 11/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 11/jre/ubuntu/noble/entrypoint.sh | 5 ----- 17/jdk/alpine/entrypoint.sh | 5 ----- 17/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 17/jdk/ubuntu/focal/entrypoint.sh | 5 ----- 17/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 17/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 17/jre/alpine/entrypoint.sh | 5 ----- 17/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 17/jre/ubuntu/focal/entrypoint.sh | 5 ----- 17/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 17/jre/ubuntu/noble/entrypoint.sh | 5 ----- 21/jdk/alpine/entrypoint.sh | 5 ----- 21/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 21/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 21/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 21/jre/alpine/entrypoint.sh | 5 ----- 21/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 21/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 21/jre/ubuntu/noble/entrypoint.sh | 5 ----- 22/jdk/alpine/entrypoint.sh | 5 ----- 22/jdk/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 22/jdk/ubuntu/jammy/entrypoint.sh | 5 ----- 22/jdk/ubuntu/noble/entrypoint.sh | 5 ----- 22/jre/alpine/entrypoint.sh | 5 ----- 22/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 22/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 22/jre/ubuntu/noble/entrypoint.sh | 5 ----- 8/jdk/alpine/entrypoint.sh | 6 +----- 8/jdk/ubi/ubi9-minimal/entrypoint.sh | 6 +----- 8/jdk/ubuntu/focal/entrypoint.sh | 6 +----- 8/jdk/ubuntu/jammy/entrypoint.sh | 6 +----- 8/jdk/ubuntu/noble/entrypoint.sh | 6 +----- 8/jre/alpine/entrypoint.sh | 5 ----- 8/jre/ubi/ubi9-minimal/entrypoint.sh | 5 ----- 8/jre/ubuntu/focal/entrypoint.sh | 5 ----- 8/jre/ubuntu/jammy/entrypoint.sh | 5 ----- 8/jre/ubuntu/noble/entrypoint.sh | 5 ----- docker_templates/entrypoint.sh.j2 | 10 +++++----- generate_dockerfiles.py | 1 + 48 files changed, 11 insertions(+), 235 deletions(-) diff --git a/11/jdk/alpine/entrypoint.sh b/11/jdk/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 index 09be1167d..c00c03280 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index 2d2040468..d51059c11 100755 --- 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 index c3f02618e..306dd4c34 100755 --- 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 diff --git a/22/jre/ubi/ubi9-minimal/entrypoint.sh b/22/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/22/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/22/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/22/jre/ubuntu/jammy/entrypoint.sh b/22/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jre/ubuntu/jammy/entrypoint.sh +++ b/22/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/22/jre/ubuntu/noble/entrypoint.sh b/22/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/22/jre/ubuntu/noble/entrypoint.sh +++ b/22/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/8/jdk/alpine/entrypoint.sh b/8/jdk/alpine/entrypoint.sh index c3f02618e..25253b7d2 100755 --- a/8/jdk/alpine/entrypoint.sh +++ b/8/jdk/alpine/entrypoint.sh @@ -26,12 +26,8 @@ set -e 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/8/jdk/ubi/ubi9-minimal/entrypoint.sh b/8/jdk/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..9e4443332 100755 --- a/8/jdk/ubi/ubi9-minimal/entrypoint.sh +++ b/8/jdk/ubi/ubi9-minimal/entrypoint.sh @@ -26,12 +26,8 @@ set -e 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/focal/entrypoint.sh +++ b/8/jdk/ubuntu/focal/entrypoint.sh @@ -26,12 +26,8 @@ set -e 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/jammy/entrypoint.sh +++ b/8/jdk/ubuntu/jammy/entrypoint.sh @@ -26,12 +26,8 @@ set -e 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/8/jdk/ubuntu/noble/entrypoint.sh b/8/jdk/ubuntu/noble/entrypoint.sh index 2d2040468..129e5cccb 100755 --- a/8/jdk/ubuntu/noble/entrypoint.sh +++ b/8/jdk/ubuntu/noble/entrypoint.sh @@ -26,12 +26,8 @@ set -e 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/8/jre/alpine/entrypoint.sh b/8/jre/alpine/entrypoint.sh index c3f02618e..306dd4c34 100755 --- a/8/jre/alpine/entrypoint.sh +++ b/8/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/8/jre/ubi/ubi9-minimal/entrypoint.sh b/8/jre/ubi/ubi9-minimal/entrypoint.sh index 09be1167d..c00c03280 100755 --- a/8/jre/ubi/ubi9-minimal/entrypoint.sh +++ b/8/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/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/focal/entrypoint.sh +++ b/8/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/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/jammy/entrypoint.sh +++ b/8/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/8/jre/ubuntu/noble/entrypoint.sh b/8/jre/ubuntu/noble/entrypoint.sh index 2d2040468..d51059c11 100755 --- a/8/jre/ubuntu/noble/entrypoint.sh +++ b/8/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/docker_templates/entrypoint.sh.j2 b/docker_templates/entrypoint.sh.j2 index 4e4baac20..6825f5a9e 100755 --- a/docker_templates/entrypoint.sh.j2 +++ b/docker_templates/entrypoint.sh.j2 @@ -13,12 +13,12 @@ set -e TMPDIR=${TMPDIR:-/tmp} # JDK truststore location -JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts - +{%- if version|int == 8 and image_type == "jdk" %} # 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 +JRE_CACERTS_PATH=$JAVA_HOME/jre/lib/security/cacerts +{%- else %} +JRE_CACERTS_PATH=$JAVA_HOME/lib/security/cacerts +{%- endif %} # Opt-in is only activated if the environment variable is set if [ -n "$USE_SYSTEM_CA_CERTS" ]; then diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index d4007cd1d..785f6a5d7 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -181,6 +181,7 @@ def archHelper(arch, os_name): entrypoint = template_entrypoint.render( os=os_name, + version=version, ) with open( From 109b9e9f268757c62d6be41f7691346e955bafaa Mon Sep 17 00:00:00 2001 From: George Adams Date: Wed, 7 Aug 2024 15:13:57 +0100 Subject: [PATCH 2/2] Update generate_dockerfiles.py --- generate_dockerfiles.py | 1 + 1 file changed, 1 insertion(+) diff --git a/generate_dockerfiles.py b/generate_dockerfiles.py index 785f6a5d7..280643bed 100644 --- a/generate_dockerfiles.py +++ b/generate_dockerfiles.py @@ -180,6 +180,7 @@ def archHelper(arch, os_name): template_entrypoint = env.get_template(template_entrypoint_file) entrypoint = template_entrypoint.render( + image_type=image_type, os=os_name, version=version, )