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

.env

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

docker-compose.yml

@@ -25,10 +25,16 @@ services:
     activemq:
         image: alfresco/alfresco-activemq:latest
 
+    digital-workspace:
+        image: quay.io/alfresco/alfresco-digital-workspace:latest
+        environment:
+            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-adw
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - digital-workspace

nginx-ingress/entrypoint.sh

@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $ADW_URL ]]; then
+  sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

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