move prod dockerfile to default, some cleanup; ssl config fix

sigp · Jun 19, 2024 · a6efdfc · a6efdfc
1 parent cab84e7
commit a6efdfc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile.prod → Dockerfile b/Dockerfile.prod → Dockerfile
@@ -32,8 +32,6 @@ RUN rm /etc/nginx/sites-enabled/default; \
     rm /etc/nginx/http.d/default.conf; \
     ln -s /app/docker-assets/siren-http.conf /etc/nginx/http.d/siren-http.conf
 
-ENTRYPOINT /app/docker-assets/docker-entrypoint-prod.sh
-
 COPY --from=builder /app/backend/package.json /app/backend/package.json
 COPY --from=builder /app/backend/node_modules /app/backend/node_modules
 COPY --from=builder /app/backend/dist /app/backend/dist
@@ -43,3 +41,5 @@ COPY --from=builder /app/package.json /app/package.json
 COPY --from=builder /app/node_modules /app/node_modules
 COPY --from=builder /app/public /app/public
 COPY --from=builder /app/.next /app/.next
+
+ENTRYPOINT /app/docker-assets/docker-entrypoint.sh
diff --git a/docker-assets/docker-entrypoint-prod.sh → docker-assets/docker-entrypoint.sh b/docker-assets/docker-entrypoint-prod.sh → docker-assets/docker-entrypoint.sh
diff --git a/docker-assets/siren-https.conf b/docker-assets/siren-https.conf
@@ -1,5 +1,6 @@
 server {
-    listen       443 default_server;
+    server_name         _;
+    listen              443 ssl;
     ssl_certificate     /certs/cert.pem;
     ssl_certificate_key /certs/key.pem;
     ssl_password_file   /certs/key.pass;