From acf439571afbaaea9ebbafef5f01f4c68a351031 Mon Sep 17 00:00:00 2001 From: eclipse-temurin-bot Date: Fri, 19 Jan 2024 10:05:35 +0000 Subject: [PATCH] dockerfile: automated nightly updates --- 11/jdk/ubuntu/focal/entrypoint.sh | 10 +++++----- 11/jdk/ubuntu/jammy/entrypoint.sh | 10 +++++----- 11/jre/ubuntu/focal/entrypoint.sh | 10 +++++----- 11/jre/ubuntu/jammy/entrypoint.sh | 10 +++++----- 17/jdk/ubuntu/focal/entrypoint.sh | 10 +++++----- 17/jdk/ubuntu/jammy/entrypoint.sh | 10 +++++----- 17/jre/ubuntu/focal/entrypoint.sh | 10 +++++----- 17/jre/ubuntu/jammy/entrypoint.sh | 10 +++++----- 21/jdk/ubuntu/jammy/entrypoint.sh | 10 +++++----- 21/jre/ubuntu/jammy/entrypoint.sh | 10 +++++----- 8/jdk/ubuntu/focal/entrypoint.sh | 10 +++++----- 8/jdk/ubuntu/jammy/entrypoint.sh | 10 +++++----- 8/jre/ubuntu/focal/entrypoint.sh | 10 +++++----- 8/jre/ubuntu/jammy/entrypoint.sh | 10 +++++----- 14 files changed, 70 insertions(+), 70 deletions(-) diff --git a/11/jdk/ubuntu/focal/entrypoint.sh b/11/jdk/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/11/jdk/ubuntu/focal/entrypoint.sh +++ b/11/jdk/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/11/jdk/ubuntu/jammy/entrypoint.sh b/11/jdk/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/11/jdk/ubuntu/jammy/entrypoint.sh +++ b/11/jdk/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/11/jre/ubuntu/focal/entrypoint.sh b/11/jre/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/11/jre/ubuntu/focal/entrypoint.sh +++ b/11/jre/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/11/jre/ubuntu/jammy/entrypoint.sh b/11/jre/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/11/jre/ubuntu/jammy/entrypoint.sh +++ b/11/jre/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/17/jdk/ubuntu/focal/entrypoint.sh b/17/jdk/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/17/jdk/ubuntu/focal/entrypoint.sh +++ b/17/jdk/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/17/jdk/ubuntu/jammy/entrypoint.sh b/17/jdk/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/17/jdk/ubuntu/jammy/entrypoint.sh +++ b/17/jdk/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/17/jre/ubuntu/focal/entrypoint.sh b/17/jre/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/17/jre/ubuntu/focal/entrypoint.sh +++ b/17/jre/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/17/jre/ubuntu/jammy/entrypoint.sh b/17/jre/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/17/jre/ubuntu/jammy/entrypoint.sh +++ b/17/jre/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/21/jdk/ubuntu/jammy/entrypoint.sh b/21/jdk/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/21/jdk/ubuntu/jammy/entrypoint.sh +++ b/21/jdk/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/21/jre/ubuntu/jammy/entrypoint.sh b/21/jre/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/21/jre/ubuntu/jammy/entrypoint.sh +++ b/21/jre/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/8/jdk/ubuntu/focal/entrypoint.sh b/8/jdk/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/8/jdk/ubuntu/focal/entrypoint.sh +++ b/8/jdk/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/8/jdk/ubuntu/jammy/entrypoint.sh b/8/jdk/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/8/jdk/ubuntu/jammy/entrypoint.sh +++ b/8/jdk/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/8/jre/ubuntu/focal/entrypoint.sh b/8/jre/ubuntu/focal/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/8/jre/ubuntu/focal/entrypoint.sh +++ b/8/jre/ubuntu/focal/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we diff --git a/8/jre/ubuntu/jammy/entrypoint.sh b/8/jre/ubuntu/jammy/entrypoint.sh index dfcf546f9..029cade7e 100755 --- a/8/jre/ubuntu/jammy/entrypoint.sh +++ b/8/jre/ubuntu/jammy/entrypoint.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env bash -# Sheband needs to be `bash`, see https://github.com/adoptium/containers/issues/415 for details +#!/usr/bin/env sh +# Converted to POSIX shell to avoid the need for bash in the image set -e @@ -9,15 +9,15 @@ if [ -n "$USE_SYSTEM_CA_CERTS" ]; then # Copy certificates from /certificates to the system truststore, but only if the directory exists and is not empty. # 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)" ]; then + if [ -d /certificates ] && [ -n "$(ls -A /certificates 2>/dev/null)" ]; then cp -a /certificates/* /usr/local/share/ca-certificates/ fi - CACERT=$JAVA_HOME/lib/security/cacerts + CACERT="$JAVA_HOME/lib/security/cacerts" # JDK8 puts its JRE in a subdirectory if [ -f "$JAVA_HOME/jre/lib/security/cacerts" ]; then - CACERT=$JAVA_HOME/jre/lib/security/cacerts + CACERT="$JAVA_HOME/jre/lib/security/cacerts" fi # OpenJDK images used to create a hook for `update-ca-certificates`. Since we are using an entrypoint anyway, we