ADW v4.1.0

.env

@@ -8,4 +8,4 @@ PROXY_PORT=8080
 ACS_TAG=7.4.1.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
-ALF_SYNC_SERV_TAG=3.9.0
+ADW_TAG=4.1.0

docker-compose.yml

@@ -23,7 +23,6 @@ services:
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                 "
         depends_on:
             - postgres-acs
@@ -35,23 +34,16 @@ services:
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
-    sync:
+    digital-workspace:
-        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
+        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
         environment:
-            JAVA_OPTS : "
+            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
-                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dmessaging.broker.host=activemq
-                -Drepo.hostname=platform
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
     
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync
+        image: local/nginx-ingress:acs-adw
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - sync
+            - digital-workspace

nginx-ingress/entrypoint.sh

@@ -4,8 +4,8 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SYNC_URL ]]; then
+if [[ $ADW_URL ]]; then
-  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

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