build: remove FMTM_SCRIPT_DOMAIN from dev setup

hotosm · Nov 5, 2023 · b85de55 · b85de55
1 parent 3705988
commit b85de55
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/docker-compose.development.yml b/docker-compose.development.yml
@@ -60,7 +60,6 @@ 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:-localhost}
     ports:
       - 80:80
       - 443:443

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:-localhost}
+      FMTM_SCRIPT_DOMAIN: ${FMTM_SCRIPT_DOMAIN}
     ports:
       - 80:80
       - 443:443
@@ -152,6 +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}
       CERT_EMAIL: ${CERT_EMAIL}
     ports:
       - 80:80

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -97,7 +97,7 @@ COPY templates/dev/fmtm.conf.template \
 
 
 FROM base as certs-init-main
-# Replace /docker-entrypoint.sh
+# Replace existing /docker-entrypoint.sh
 COPY 100-renew-certs.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 COPY templates/cert-init/fmtm.conf.template \
@@ -107,8 +107,13 @@ COPY templates/cert-init/fmtm.conf.template \
 
 
 
-FROM certs-init-main as certs-init-development
-COPY templates/cert-init/odk.conf.template \
+FROM base as certs-init-development
+# Replace existing /docker-entrypoint.sh
+COPY 100-renew-certs.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+COPY templates/cert-init/fmtm.conf.template \
+     templates/cert-init/api.conf.template \
+     templates/cert-init/odk.conf.template \
      templates/cert-init/minio.conf.template \
      /etc/nginx/templates/