Merge branch 'ats-base' into acs-ats-base

.env

@@ -4,10 +4,3 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-
-ACS_TAG=7.4.1.1
-ATE_AIO_TAG=4.0.0
-AAMQ_TAG=latest
-POSTGRES_TAG=13
-ASIE_TAG=2.0.8.2
-ACS_SHARE_TAG=7.4.1.2

docker-compose.yml

@@ -1,130 +1,65 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
     platform:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: alfresco/alfresco-content-repository:latest
         environment:
-            JAVA_TOOL_OPTIONS: "
-                -Dencryption.keystore.type=JCEKS
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-                -Dencryption.keyAlgorithm=DESede
-                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-                -Dmetadata-keystore.password=mp6yc0UD9e
-                -Dmetadata-keystore.aliases=metadata
-                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-                -Dmetadata-keystore.metadata.algorithm=DESede
-                "
             JAVA_OPTS: "
-                -Xms512m -Xmx1g
+                -Ddb.driver=org.postgresql.Driver
-                -Ddb.driver=com.mysql.jdbc.Driver
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Ddb.username=alfresco
-                -Ddb.password=alfresco
-                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.secureComms=secret
-                -Dsolr.sharedSecret=alfresco-secret
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-                -Djodconverter.url=http://transform-core-aio:8090/
-                -Dimg.url=http://transform-core-aio:8090/
-                -Dtika.url=http://transform-core-aio:8090/
-                -Dtransform.misc.url=http://transform-core-aio:8090/
-                -Dcsrf.filter.enabled=false
-                -Dcors.enabled=false
-                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=true
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
                 "
         depends_on:
-            - mysql-acs
+            - postgres-acs
             - activemq
-        volumes:
+            - shared-file-store
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
+    
-            - /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro
+    transform-router:
+        image: quay.io/alfresco/alfresco-transform-router:latest
+        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:${ATE_AIO_TAG}
+        image: alfresco/alfresco-transform-core-aio:latest
-    
-    share:
-        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
         environment:
-            REPO_HOST: "platform"
+            ACTIVEMQ_URL: "nio://activemq:61616"
-            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
+        depends_on:
-            JAVA_OPTS: "
+            - activemq
-                -Dshare.host=${PROXY_HOST}
+            - shared-file-store
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                "
 
-    mysql-acs:
+    shared-file-store:
-        image: mysql:5.7
+        image: alfresco/alfresco-shared-file-store:latest
-        environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
-            - MYSQL_PASSWORD=alfresco
-            - MYSQL_USER=alfresco
-            - MYSQL_DATABASE=alfresco
         volumes:
-            - acsdb-volume:/var/lib/mysql:rw
+            - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    search:
+    postgres-acs:
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        image: postgres:latest
-        environment:
-            SOLR_ALFRESCO_HOST: platform
-            SOLR_SOLR_HOST: search
-            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-            ALFRESCO_SECURE_COMMS: secret
-            JAVA_TOOL_OPTIONS: "
-                -Dalfresco.secureComms.secret=alfresco-secret
-                "
-        healthcheck:
-            test: "curl -fsS http://localhost:8983/solr"
-        volumes:
-            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
-        image: alfresco/alfresco-activemq:${AAMQ_TAG}
+        image: alfresco/alfresco-activemq:latest
-        environment:
-            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - share
 
 volumes:
-    acsbin-volume:
+    shared-file-store-volume:
-        driver: local
+        driver_opts:
-    acsdb-volume:
+            type: tmpfs
-        driver: local
+            device: tmpfs
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local
-

nginx-ingress/entrypoint.sh

@@ -4,10 +4,6 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SHARE_URL ]]; then
-  sed -i s%http:\/\/share:8080%"$ACS_SHARE_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,12 +48,5 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
-
-        location /share/ {
-            proxy_pass http://share:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
     }
 }