Merge branch 'acs-adw-base' into acs-frontend-enterprise

docker-compose.yml

@@ -150,6 +150,7 @@ services:
         mem_limit: 128m
         environment:
             BASE_PATH: ./
+            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
     
     proxy:
         build: ./nginx-ingress

nginx-ingress/nginx.conf

@@ -61,7 +61,7 @@ http {
         }
         
         location /workspace/ {
-            proxy_pass http://digital-workspace:8080;
+            proxy_pass http://digital-workspace:8080/;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;