From 24f3bd02041bd876f8b0cd1ae73d4b94a73224a7 Mon Sep 17 00:00:00 2001
From: ebrahimmfadae <ebrahimmfadae@gmail.com>
Date: Mon, 1 Aug 2022 12:09:22 +0430
Subject: [PATCH] Replace hardcoded server names with envs

---
 Dockerfile         | 12 +++++++++++-
 docker-compose.yml |  7 ++++++-
 nginx.conf         | 10 +++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5a1dc52..a952c7c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,5 +2,15 @@ FROM nginx:1.20.2
 COPY nginx.conf /etc/nginx/nginx.conf.org
 COPY health-check.conf netnegar.conf /etc/nginx/
 ENV EXPOSED_PORT 443
-ENTRYPOINT sh -c 'envsubst \$EXPOSED_PORT < /etc/nginx/nginx.conf.org | tee /etc/nginx/nginx.conf && nginx -g "daemon off;"'
+ENV SERVER_NAME_DASHBOARD dashbrd-demo.opex.dev
+ENV SERVER_NAME_ADMIN_PANEL adm-demo.opex.dev
+ENV SERVER_NAME_WEB_APP demo.opex.dev
+ENV SERVER_NAME_AUTH auth-demo.opex.dev
+ENV SERVER_NAME_API api.opex.dev
+ENTRYPOINT sh -c 'envsubst \$EXPOSED_PORT \
+                           \$SERVER_NAME_DASHBOARD \
+                           \$SERVER_NAME_ADMIN_PANEL \
+                           \$SERVER_NAME_WEB_APP \
+                           \$SERVER_NAME_AUTH \
+                           \$SERVER_NAME_API < /etc/nginx/nginx.conf.org | tee /etc/nginx/nginx.conf && nginx -g "daemon off;"'
 EXPOSE 443
diff --git a/docker-compose.yml b/docker-compose.yml
index 13916c6..a5db883 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,11 @@ services:
     build: .
     environment:
       - EXPOSED_PORT=$EXPOSED_PORT
+      - SERVER_NAME_DASHBOARD=$SERVER_NAME_DASHBOARD
+      - SERVER_NAME_ADMIN_PANEL=$SERVER_NAME_ADMIN_PANEL
+      - SERVER_NAME_WEB_APP=$SERVER_NAME_WEB_APP
+      - SERVER_NAME_AUTH=$SERVER_NAME_AUTH
+      - SERVER_NAME_API=$SERVER_NAME_API
     secrets:
       - opex_dev_crt
       - private_pem
@@ -12,4 +17,4 @@ secrets:
   opex_dev_crt:
     file: opex.dev.crt
   private_pem:
-    file: private.pem
\ No newline at end of file
+    file: private.pem
diff --git a/nginx.conf b/nginx.conf
index 5e5b2d8..7f48334 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -41,7 +41,7 @@ http {
         listen 443 ssl;
         listen [::]:443 ssl;
 
-        server_name dashbrd-demo.opex.dev;
+        server_name $SERVER_NAME_DASHBOARD;
 
         location / {
             set $backend http://superset:8088;
@@ -53,7 +53,7 @@ http {
         listen 443 ssl;
         listen [::]:443 ssl;
 
-        server_name adm-demo.opex.dev;
+        server_name $SERVER_NAME_ADMIN_PANEL;
 
         location ~* \.(.*)$ {
             set $backend http://admin-panel;
@@ -71,7 +71,7 @@ http {
         listen 443 ssl;
         listen [::]:443 ssl;
 
-        server_name demo.opex.dev;
+        server_name $SERVER_NAME_WEB_APP;
 
         location ~* \.(.*)$ {
             set $backend http://web-app;
@@ -89,7 +89,7 @@ http {
         listen 443 ssl;
         listen [::]:443 ssl;
 
-        server_name auth-demo.opex.dev;
+        server_name $SERVER_NAME_AUTH;
 
         location / {
             set $backend http://auth:8080;
@@ -102,7 +102,7 @@ http {
         listen 443 ssl;
         listen [::]:443 ssl;
 
-        server_name api.opex.dev;
+        server_name $SERVER_NAME_API;
 
         limit_req zone=default burst=5 nodelay;