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

docker-compose.yml

@@ -5,7 +5,7 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository:6.2.2.3
+        image: alfresco/alfresco-content-repository-community:6.2.0-ga
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -17,6 +17,9 @@ services:
                 -Dsolr.host=search
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -32,18 +35,7 @@ services:
                 -Dcsrf.filter.enabled=false
                 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
 
-                -Dtransform.service.enabled=true
+                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=false
-
-                -Dtransform.service.url=http://transform-router:8095
-                -Dsfs.url=http://shared-file-store:8099
-                -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
-                -Djodconverter.url=http://transform-engine-aio:8090
-                -Dimg.url=http://transform-engine-aio:8090
-                -Dtika.url=http://transform-engine-aio:8090
-                -Dtransform.misc.url=http://transform-engine-aio:8090
-
-                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                 
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
@@ -52,34 +44,27 @@ services:
         depends_on:
             - postgres-acs
             - activemq
-            - shared-file-store
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
             - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
-    transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:1.3.1
-        environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
-            CORE_AIO_URL : "http://transform-core-aio:8090"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        depends_on:
-            - activemq
-            - shared-file-store
-    
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+    
+    share:
+        image: alfresco/alfresco-share:6.2.2
+        mem_limit: 512m
         environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
+            REPO_HOST: "platform"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
-        depends_on:
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
-            - activemq
+            JAVA_OPTS: "
-            - shared-file-store
+                -Dshare.host=${PROXY_HOST}
-
+                -Dshare.port=${PROXY_PORT}
-    shared-file-store:
+                -Dshare.protocol=${PROXY_PROTOCOL}
-        image: alfresco/alfresco-shared-file-store:0.10.0
+                -Dalfresco.host=${PROXY_HOST}
-        volumes:
+                -Dalfresco.port=${PROXY_PORT}
-            - shared-file-store-volume:/tmp/Alfresco/sfs
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                "
     
     postgres-acs:
         image: postgres:11.7
@@ -111,39 +96,16 @@ services:
         volumes:
             - activemq-volume:/opt/activemq/data:rw
 
-    sync:
-        image: quay.io/alfresco/service-sync:3.3.3.1
-        mem_limit: 512m
-        environment:
-            JAVA_OPTS : "
-                -Dsql.db.driver=org.postgresql.Driver
-                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dsql.db.username=alfresco
-                -Dsql.db.password=alfresco
-                -Dmessaging.broker.host=activemq
-                -Drepo.hostname=platform
-                -Drepo.port=8080
-                -Ddw.server.applicationConnectors[0].type=http
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-                "
-        depends_on:
-            - postgres-acs
-            - activemq
-
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync
+        image: local/nginx-ingress:acs-share
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - sync
+            - share
 
 volumes:
-    shared-file-store-volume:
-        driver_opts:
-            type: tmpfs
-            device: tmpfs
     acsbin-volume:
         driver: local
     acsdb-volume:

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 [[ $ACS_SHARE_URL ]]; then
-  sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

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