From a6efdfc8b8bf759dd1f687920b751690ebd22142 Mon Sep 17 00:00:00 2001 From: antondlr Date: Wed, 19 Jun 2024 14:16:17 +0200 Subject: [PATCH] move prod dockerfile to default, some cleanup; ssl config fix --- Dockerfile.prod => Dockerfile | 4 ++-- .../{docker-entrypoint-prod.sh => docker-entrypoint.sh} | 0 docker-assets/siren-https.conf | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) rename Dockerfile.prod => Dockerfile (95%) rename docker-assets/{docker-entrypoint-prod.sh => docker-entrypoint.sh} (100%) diff --git a/Dockerfile.prod b/Dockerfile similarity index 95% rename from Dockerfile.prod rename to Dockerfile index 765a4b2b..40a408b3 100644 --- a/Dockerfile.prod +++ b/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 b/docker-assets/docker-entrypoint.sh similarity index 100% rename from docker-assets/docker-entrypoint-prod.sh rename to docker-assets/docker-entrypoint.sh diff --git a/docker-assets/siren-https.conf b/docker-assets/siren-https.conf index 1c33457f..39f332a9 100644 --- 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;