Merge branch 'acs-base' into acs-sync-base

docker-compose.yml

@@ -14,35 +14,35 @@ 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
             - activemq
-        volumes:
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     postgres-acs:
         image: postgres:latest
-        volumes:
-            - acsdb-volume:/var/lib/postgresql/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:latest
-        volumes:
+
-            - activemq-volume:/opt/activemq/data:rw
+    sync:
+        image: quay.io/alfresco/service-sync:latest
+        environment:
+            JAVA_OPTS : "
+                -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
+        image: local/nginx-ingress:acs-sync
         ports:
             - 8080:8080
         depends_on:
             - platform
-
+            - sync
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local

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 [[ $ACS_SYNC_URL ]]; then
+  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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,9 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+        
+        location /sync/ {
+            proxy_pass http://sync:9090/alfresco/;
+        }
     }
 }