From 2633a0329589439d5ff8e55b9a64b6a4b9b113bc Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Tue, 21 Sep 2021 15:30:12 +0200 Subject: [PATCH] feat: add nginx default config. --- client/Dockerfile | 3 +-- client/nginx/scripts/nginx-build.sh | 18 ------------------ .../sites/{node.template => default.conf} | 0 3 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 client/nginx/scripts/nginx-build.sh rename client/nginx/sites/{node.template => default.conf} (100%) diff --git a/client/Dockerfile b/client/Dockerfile index 23893bed1..f6d50f1f5 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -22,8 +22,7 @@ RUN npm run build FROM nginx -COPY nginx/sites /etc/nginx/templates -COPY ./nginx/scripts /root/scripts/ +COPY ./nginx/sites/default.conf /etc/nginx/conf.d/default.conf RUN /bin/bash /root/scripts/nginx-build.sh diff --git a/client/nginx/scripts/nginx-build.sh b/client/nginx/scripts/nginx-build.sh deleted file mode 100644 index 54c470866..000000000 --- a/client/nginx/scripts/nginx-build.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -for conf in /etc/nginx/templates/*.conf; do - mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null -done - -for template in /etc/nginx/templates/*.template; do - envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf" -done - -if [[ "$NO_DEFAULT" = true ]]; then - rm /etc/nginx/sites-available/node.template.conf - rm /etc/nginx/sites-available/node-https.template.conf -else - if [[ "$WEB_SSL" = false ]]; then - rm /etc/nginx/sites-available/node-https.template.conf - fi -fi diff --git a/client/nginx/sites/node.template b/client/nginx/sites/default.conf similarity index 100% rename from client/nginx/sites/node.template rename to client/nginx/sites/default.conf