Merge branch 'acs-frontend-enterprise' into acs-frontend-enterprise-persist

.env

@@ -1,6 +1,6 @@
-EXTERNAL_RESOURCE_DIR=~
+EXTERNAL_RESOURCE_DIR=/home/brian
 ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
-ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost

docker-compose.yml

@@ -154,6 +154,8 @@ services:
         mem_limit: 128m
         environment:
             BASE_PATH: ./
+            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
     
     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;