[#230] Add configuration of record manager server within deployments

kbss-cvut · Oct 7, 2024 · 1731b82 · 1731b82
1 parent d583ddd
commit 1731b82
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/deploy/internal-auth/.env b/deploy/internal-auth/.env
@@ -20,3 +20,6 @@ FORMGEN_SERVICE_URL=http://s-pipes-engine:8080/s-pipes/service?_pId=clone-form
 RECORD_MANAGER_APP_TITLE=Record Manager
 
 LANGUAGE=en
+
+# Internal address where record manager server runs which should be accessible from inside of docker. Use `http://host.docker.internal` to access http://localhost of the host computer.
+#INTERNAL_RECORD_MANAGER_SERVER_SERVICE=http://host.docker.internal:8080
diff --git a/deploy/keycloak-auth/.env b/deploy/keycloak-auth/.env
@@ -20,3 +20,6 @@ FORMGEN_SERVICE_URL=http://s-pipes-engine:8080/s-pipes/service?_pId=clone-form
 RECORD_MANAGER_APP_TITLE=Record Manager
 
 LANGUAGE=en
+
+# Internal address where record manager server runs which should be accessible from inside of docker. Use `http://host.docker.internal` to access http://localhost of the host computer.
+#INTERNAL_RECORD_MANAGER_SERVER_SERVICE=http://host.docker.internal:8080
diff --git a/deploy/keycloak-auth/docker-compose.yml b/deploy/keycloak-auth/docker-compose.yml
@@ -31,6 +31,8 @@ services:
       APP_ROOT_PATH: "${APP_ROOT_PATH:-}"
       RECORD_MANAGER_PATH: "${RECORD_MANAGER_PATH:-/record-manager}"
       ANALYTICS_PATH: "${ANALYTICS_PATH:-/statistics}"
+      INTERNAL_RECORD_MANAGER_SERVER_SERVICE: "${INTERNAL_RECORD_MANAGER_SERVER_SERVICE:-http://record-manager-server:8080}"
+
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template:ro
       - ../shared/nginx/error.html:/usr/share/nginx/html/error.html:ro

diff --git a/deploy/keycloak-auth/nginx/nginx.conf b/deploy/keycloak-auth/nginx/nginx.conf
@@ -51,7 +51,7 @@ http {
         }
 
         location /services/record-manager-server/ {
-            proxy_pass http://record-manager-server:8080/record-manager/; # keep the trailing slash to cut off matched prefix
+            proxy_pass ${INTERNAL_RECORD_MANAGER_SERVER_SERVICE}/record-manager/; # keep the trailing slash to cut off matched prefix
             proxy_cookie_path /record-manager ${APP_ROOT_PATH}/services;
         }