[New] Support replacement of backend for development in internal-auth

kbss-cvut · Nov 13, 2024 · f4884a3 · f4884a3
1 parent f4aad3c
commit f4884a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/deploy/internal-auth/.env b/deploy/internal-auth/.env
@@ -21,5 +21,6 @@ RECORD_MANAGER_APP_TITLE=Record Manager
 
 APP_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
+# Internal address where record manager server runs which should be accessible from inside of docker. To access http://localhost of the host computer use value "http://host.docker.internal".
+# See "extra-hosts" within docker-compose file for more info.
+INTERNAL_RECORD_MANAGER_SERVER_SERVICE=http://host.docker.internal:8080
diff --git a/deploy/internal-auth/docker-compose.yml b/deploy/internal-auth/docker-compose.yml
@@ -31,6 +31,10 @@ 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}"
+    extra_hosts:
+      - "host.docker.internal:host-gateway" # support "http://host.docker.internal" for Linux (Windows/Mac works without it)
+
     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/internal-auth/nginx/nginx.conf b/deploy/internal-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;
         }
 
@@ -61,16 +61,21 @@ http {
 
         location /services/db-server/ {
             proxy_pass http://db-server:7200/; # keep the trailing slash to cut off matched prefix
+
+            proxy_set_header Host $host;
+
+            # Ensure Location headers are rewritten properly as X-Forwarded-Port is ignored
+            proxy_redirect http://localhost/  ${APP_ORIGIN}/services/db-server/;
         }
 
         location /services/s-pipes/ {
             proxy_pass http://s-pipes-engine:8080/; # keep the trailing slash to cut off matched prefix
         }
 
-    	location ${ANALYTICS_PATH} {
+        location ${ANALYTICS_PATH} {
            try_files /statistics.html =404; 
            root /usr/share/nginx/html;
-    	}
+        }
 
         location /health-check {
             return 200;