Merge pull request #33 from tomdess/code-review

Code review (minor fixes in scripts)

Author: tomdess

.github/workflows/docker-publish.yml

@@ -44,7 +44,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -54,7 +54,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 

scripts/bootstrap.sh

@@ -1,5 +1,11 @@
 #!/usr/bin/env bash
 
+# Validate required environment variables
+if [ -z "$EMAIL" ]; then
+  echo "ERROR: EMAIL environment variable is required"
+  exit 1
+fi
+
 # save container environment variables to use it
 # in cron scripts
 

scripts/cert-renewal-haproxy.sh

@@ -56,6 +56,9 @@ function logger_info {
 ### MAIN
 ################################################################################
 
+# Before renewal, ensure any leftover validation files are removed
+rm -rf ${WEBROOT}/.well-known/acme-challenge/*
+
 le_cert_root="/etc/letsencrypt/live"
 
 if [ ! -d ${le_cert_root} ]; then