minor in env [ci skip]

FORTH-ICS-INSPIRE · Oct 25, 2022 · ebdbfb7 · ebdbfb7
1 parent daa511f
commit ebdbfb7
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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