From 21fd826720ab2206a92bb28ab2889a077793c00f Mon Sep 17 00:00:00 2001 From: Kevin Krummenauer Date: Sat, 19 Oct 2024 21:52:32 +0200 Subject: [PATCH 1/2] Exit script on failure --- resources/create-certs.sh | 5 +++++ resources/entrypoint.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/resources/create-certs.sh b/resources/create-certs.sh index b1b785d..b777b31 100644 --- a/resources/create-certs.sh +++ b/resources/create-certs.sh @@ -1,5 +1,10 @@ #!/bin/sh #see https://docs.docker.com/engine/security/https/ +set -e + +if [ "$DEBUG" = "true" ]; then + set -x +fi EXPIRATIONDAYS=700 CASUBJSTRING="/C=GB/ST=London/L=London/O=ExampleCompany/OU=IT/CN=example.com/emailAddress=test@example.com" diff --git a/resources/entrypoint.sh b/resources/entrypoint.sh index e0b6a8a..3443263 100644 --- a/resources/entrypoint.sh +++ b/resources/entrypoint.sh @@ -1,4 +1,9 @@ #!/bin/sh +set -e + +if [ "$DEBUG" = "true" ]; then + set -x +fi if [ -n "$CERTS_PASSWORD_FILE" ]; then echo "Using cert password from $CERTS_PASSWORD_FILE" From 78c8d617223a5fa4ecb1fcc7070c86ef1103137b Mon Sep 17 00:00:00 2001 From: Kevin Krummenauer Date: Sat, 19 Oct 2024 22:04:28 +0200 Subject: [PATCH 2/2] Fix CREATE_CERTS_WITH_PW variable check --- resources/entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/entrypoint.sh b/resources/entrypoint.sh index 3443263..6634bdd 100644 --- a/resources/entrypoint.sh +++ b/resources/entrypoint.sh @@ -10,7 +10,7 @@ if [ -n "$CERTS_PASSWORD_FILE" ]; then CREATE_CERTS_WITH_PW="$(cat $CERTS_PASSWORD_FILE)" fi -if [ -n $CREATE_CERTS_WITH_PW ]; then +if [ -n "$CREATE_CERTS_WITH_PW" ]; then if [ -z "$(ls -A $CERTS_DIR)" ]; then echo "Create CA cert" @@ -31,4 +31,7 @@ if [ -n $CREATE_CERTS_WITH_PW ]; then echo "$CERTS_DIR is not empty. Not creating certs." fi + +else + echo "CREATE_CERTS_WITH_PW is not set. Not creating certs." fi