build: add defaults for FMTM_SCRIPT_DOMAIN (nginx fails)

hotosm · Nov 5, 2023 · 1ecba95 · 1ecba95
1 parent 4d77c15
commit 1ecba95
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -60,6 +60,7 @@ services:
       FMTM_API_DOMAIN: ${FMTM_API_DOMAIN:-${VITE_API_URL:-api.${FMTM_DOMAIN}}}
       FMTM_ODK_DOMAIN: ${FMTM_ODK_DOMAIN:-odk.${FMTM_DOMAIN}}
       FMTM_S3_DOMAIN: ${FMTM_S3_DOMAIN:-s3.${FMTM_DOMAIN}}
+      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN:-_}
     ports:
       - 80:80
       - 443:443
@@ -256,6 +257,7 @@ services:
       FMTM_API_DOMAIN: ${FMTM_API_DOMAIN:-${VITE_API_URL:-api.${FMTM_DOMAIN}}}
       FMTM_ODK_DOMAIN: ${FMTM_ODK_DOMAIN:-odk.${FMTM_DOMAIN}}
       FMTM_S3_DOMAIN: ${FMTM_S3_DOMAIN:-s3.${FMTM_DOMAIN}}
+      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN:-_}
       CERT_EMAIL: ${CERT_EMAIL}
     ports:
       - 80:80

diff --git a/docker-compose.main.yml b/docker-compose.main.yml
@@ -48,7 +48,7 @@ services:
     environment:
       FMTM_DOMAIN: ${FMTM_DOMAIN}
       FMTM_API_DOMAIN: ${VITE_API_URL:-api.${FMTM_DOMAIN}}
-      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN}
+      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN:-_}
     ports:
       - 80:80
       - 443:443
@@ -152,7 +152,7 @@ services:
     environment:
       FMTM_DOMAIN: ${FMTM_DOMAIN}
       FMTM_API_DOMAIN: ${FMTM_API_DOMAIN:-${VITE_API_URL:-api.${FMTM_DOMAIN}}}
-      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN}
+      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN:-_}
       CERT_EMAIL: ${CERT_EMAIL}
     ports:
       - 80:80

diff --git a/nginx/container-entrypoint.sh b/nginx/container-entrypoint.sh
@@ -68,7 +68,7 @@ certbot --non-interactive certonly "${certbot_args[@]}"
 echo "Certificate generated under: /etc/letsencrypt/live/${FMTM_DOMAIN}/"
 
 # Add FMTM_SCRIPT_DOMAIN if present
-if [ -n "${FMTM_SCRIPT_DOMAIN}" ]; then
+if [ -n "${FMTM_SCRIPT_DOMAIN}" ] && [ "${FMTM_SCRIPT_DOMAIN}" != "_" ]; then
     echo
     echo "FMTM_SCRIPT_DOMAIN variable set. Generating separate certificate."
     certbot --non-interactive certonly \