From ebdbfb7af089305c70be466810ff871d61e9d020 Mon Sep 17 00:00:00 2001
From: Vasileios Kotronis <biece89@gmail.com>
Date: Tue, 25 Oct 2022 14:04:02 +0300
Subject: [PATCH] minor in env [ci skip]

---
 .env                                             | 2 ++
 artemis-chart/templates/configmap.yaml           | 1 +
 artemis-chart/templates/frontend-deployment.yaml | 5 +++++
 artemis-chart/values.yaml                        | 1 +
 docker-compose.yaml                              | 1 +
 docs/envvars.md                                  | 5 +++++
 vagrant-vm/vagrant-docker-compose.yaml           | 1 +
 7 files changed, 16 insertions(+)

diff --git a/.env b/.env
index f32e1bcd..343337c7 100644
--- a/.env
+++ b/.env
@@ -16,6 +16,8 @@ CONFIG_PORT=3000
 API_HOST=postgrest
 API_PORT=3000
 DATABASE_HOST=database
+NGINX_HOST=nginx
+
 
 # Monitor-specific configs
 RIS_ID=8522
diff --git a/artemis-chart/templates/configmap.yaml b/artemis-chart/templates/configmap.yaml
index a4730df5..d9e0361c 100644
--- a/artemis-chart/templates/configmap.yaml
+++ b/artemis-chart/templates/configmap.yaml
@@ -13,6 +13,7 @@ data:
   redisPort: {{ .Values.redisPort | default "6379" | quote }}
   apiHost: {{ .Values.apiHost | default "postgrest" }}
   apiPort: {{ .Values.apiPort | default "3000" | quote }}
+  nginxHost: {{ .Values.nginxHost | default "nginx" }}
   configHost: {{ .Values.configHost | default "configuration" }}
   configPort: {{ .Values.configPort | default "3000" | quote }}
   databaseHost: {{ .Values.databaseHost | default "database" }}
diff --git a/artemis-chart/templates/frontend-deployment.yaml b/artemis-chart/templates/frontend-deployment.yaml
index b76145f8..b40946c6 100644
--- a/artemis-chart/templates/frontend-deployment.yaml
+++ b/artemis-chart/templates/frontend-deployment.yaml
@@ -28,6 +28,11 @@ spec:
             configMapKeyRef:
               name: configmap
               key: apiHost
+        - name: NGINX_HOST
+          valueFrom:
+            configMapKeyRef:
+              name: configmap
+              key: nginxHost
         - name: API_KEY
           valueFrom:
             secretKeyRef:
diff --git a/artemis-chart/values.yaml b/artemis-chart/values.yaml
index 4c076bdd..75ac74fe 100644
--- a/artemis-chart/values.yaml
+++ b/artemis-chart/values.yaml
@@ -17,6 +17,7 @@ configHost: configuration
 configPort: 3000
 databaseHost: database
 restPort: 3000
+nginxHost: nginx
 
 # monitor-specific configs
 risId: 8522
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0037f57e..315aef01 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -461,6 +461,7 @@ services:
             RABBITMQ_HOST: ${RABBITMQ_HOST}
             RABBITMQ_PORT: ${RABBITMQ_PORT}
             SESSION_TIMEOUT: ${SESSION_TIMEOUT}
+            NGINX_HOST: ${NGINX_HOST}
             TESTING: ${TEST_ENV}
     mongodb:
         image: mongo:4.4.6-bionic
diff --git a/docs/envvars.md b/docs/envvars.md
index 74b5e132..5932738b 100644
--- a/docs/envvars.md
+++ b/docs/envvars.md
@@ -63,6 +63,11 @@ Database container IP and port (containers have their name as hostname):
 DATABASE_HOST=database
 ```
 
+Nginx container IP (containers have their name as hostname):
+```
+NGINX_HOST=nginx
+```
+
 ## Monitor-specific configs
 
 Unique ID to be used for RIPE RIS BGP update streaming (recommended: use ASN)
diff --git a/vagrant-vm/vagrant-docker-compose.yaml b/vagrant-vm/vagrant-docker-compose.yaml
index 0037f57e..315aef01 100644
--- a/vagrant-vm/vagrant-docker-compose.yaml
+++ b/vagrant-vm/vagrant-docker-compose.yaml
@@ -461,6 +461,7 @@ services:
             RABBITMQ_HOST: ${RABBITMQ_HOST}
             RABBITMQ_PORT: ${RABBITMQ_PORT}
             SESSION_TIMEOUT: ${SESSION_TIMEOUT}
+            NGINX_HOST: ${NGINX_HOST}
             TESTING: ${TEST_ENV}
     mongodb:
         image: mongo:4.4.6-bionic