From 7a629736fb1ab45179a4fda1391f35b8d5d5a8ed Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 18 Jan 2022 17:26:01 +1000 Subject: [PATCH] Ensure env vars are set for acme.sh images --- docker/Dockerfile.acmesh-golang | 9 ++++++++- files/acme.sh-wrapper | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.acmesh-golang b/docker/Dockerfile.acmesh-golang index 86f7be7..56fc827 100644 --- a/docker/Dockerfile.acmesh-golang +++ b/docker/Dockerfile.acmesh-golang @@ -13,7 +13,14 @@ RUN apt-get update \ # copy go from golang COPY --from=go /usr/local/go /usr/local/go -ENV GOPATH=/opt/go PATH="/usr/local/go/bin:$PATH:/opt/go/bin" +ENV GOPATH=/opt/go \ + PATH="/usr/local/go/bin:$PATH:/opt/go/bin" \ + ACMESH_CONFIG_HOME=/data/.acme.sh/config \ + ACMESH_HOME=/data/.acme.sh \ + CERT_HOME=/data/.acme.sh/certs \ + LE_CONFIG_HOME=/data/.acme.sh/config \ + LE_WORKING_DIR=/data/.acme.sh + RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \ && chmod -R 777 "$GOPATH" \ && echo "====> ${TARGETPLATFORM}: $(go version)" diff --git a/files/acme.sh-wrapper b/files/acme.sh-wrapper index 3c4b58a..67b5461 100755 --- a/files/acme.sh-wrapper +++ b/files/acme.sh-wrapper @@ -1,5 +1,27 @@ #!/bin/bash -e +# Ensure env vars are set +if [ "$ACMESH_HOME" = "" ]; then + echo "Error: ACMESH_HOME is not set!" + exit 1 +fi +if [ "$ACMESH_CONFIG_HOME" = "" ]; then + echo "Error: ACMESH_CONFIG_HOME is not set!" + exit 1 +fi +if [ "$CERT_HOME" = "" ]; then + echo "Error: CERT_HOME is not set!" + exit 1 +fi +if [ "$LE_CONFIG_HOME" = "" ]; then + echo "Error: LE_CONFIG_HOME is not set!" + exit 1 +fi +if [ "$LE_WORKING_DIR" = "" ]; then + echo "Error: LE_WORKING_DIR is not set!" + exit 1 +fi + # Ensure acme.sh dirs exist mkdir -p "$ACMESH_HOME" "$ACMESH_CONFIG_HOME" "$CERT_HOME" "$LE_CONFIG_HOME" "$LE_WORKING_DIR"