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

.env

@@ -4,3 +4,14 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+ATR_TAG=3.0.0
+ATE_AIO_TAG=4.0.0
+ASFS_TAG=3.0.0
+AAMQ_TAG=latest
+POSTGRES_TAG=13
+ASIE_TAG=2.0.8.2
+ACS_SHARE_TAG=7.4.1.2
+ALF_SYNC_SERV_TAG=3.9.0
+ADW_TAG=4.1.0

README.md

@@ -3,3 +3,11 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
+## Licensing
+
+This version of Alfresco requires licensing.
+
+### ACS Enterprise
+
+The enterprise version of ACS requires a license file for it to work for more than 2 days.  This means it isn't really required, but it is becomes important when you utilize any `persist` branch.  For licensing to work, you must place your license file in the following directory relative to the user home directory that runs the Docker Compose command: `alfresco/license/acs`.  There must be just one file in there that ends in `.lic`.
+

docker-compose.yml

@@ -1,22 +1,32 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "3"
-version: "2"
 
 services:
+
     platform:
-        image: alfresco/alfresco-content-repository-community:6.2.0-ga
+        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
-        mem_limit: 1700m
         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: "
-                -Ddb.driver=com.mysql.jdbc.Driver
+                -Xms512m -Xmx1g
+                -Ddb.driver=org.postgresql.Driver
                 -Ddb.username=alfresco
                 -Ddb.password=alfresco
-                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
                 -Dindex.subsystem.name=solr6
                 -Dsolr.host=search
-                -Dsolr.port=8983
+                -Dsolr.secureComms=secret
-                -Dsolr.secureComms=none
+                -Dsolr.sharedSecret=alfresco-secret
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
@@ -26,34 +36,56 @@ services:
                 -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
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+                -Dcors.enabled=false
-
+                -Dtransform.service.enabled=true
-                -Dtransform.service.enabled=false
+                -Dtransform.service.url=http://transform-router:8095
-                
+                -Dsfs.url=http://shared-file-store:8099
+                -Dlocal.transform.service.enabled=true
+                -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
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - mysql-acs
+            - 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
-            - /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro
+    
+    transform-router:
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
+        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
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+        environment:
+            ACTIVEMQ_URL: "nio://activemq:61616"
+            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+        depends_on:
+            - activemq
+            - shared-file-store
+
+    shared-file-store:
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
+        volumes:
+            - shared-file-store-volume:/tmp/Alfresco/sfs
     
     share:
-        image: alfresco/alfresco-share:6.2.2
+        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
-        mem_limit: 512m
         environment:
             REPO_HOST: "platform"
             CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
@@ -67,46 +99,81 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
     
-    mysql-acs:
+    postgres-acs:
-        image: mysql:5.7
+        image: postgres:${POSTGRES_TAG}
-        mem_limit: 512m
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            POSTGRES_PASSWORD: alfresco
-            - MYSQL_PASSWORD=alfresco
+            POSTGRES_USER: alfresco
-            - MYSQL_USER=alfresco
+            POSTGRES_DB: alfresco
-            - MYSQL_DATABASE=alfresco
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
         volumes:
-            - acsdb-volume:/var/lib/mysql:rw
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
-        image: alfresco/alfresco-search-services:2.0.1
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
-        mem_limit: 2g
         environment:
-            - SOLR_ALFRESCO_HOST=platform
+            SOLR_ALFRESCO_HOST: platform
-            - SOLR_ALFRESCO_PORT=8080
+            SOLR_SOLR_HOST: search
-            - SOLR_SOLR_HOST=search
+            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-            - SOLR_SOLR_PORT=8983
+            ALFRESCO_SECURE_COMMS: secret
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            JAVA_TOOL_OPTIONS: "
-            - ALFRESCO_SECURE_COMMS=none
+                -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:5.15.8
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        mem_limit: 256m
+        environment:
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
         volumes:
             - activemq-volume:/opt/activemq/data:rw
 
+    sync:
+        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
+        environment:
+            JAVA_OPTS : "
+                -Xms64m -Xmx256m
+                -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
+                "
+        depends_on:
+            - postgres-acs
+            - activemq
+
+    digital-workspace:
+        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
+        environment:
+            BASE_PATH: ./
+            APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/#/preview/s"
+    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs-sync-share-adw
         ports:
             - 8080:8080
         depends_on:
             - platform
+            - sync
             - share
+            - digital-workspace
 
 volumes:
+    shared-file-store-volume:
+        driver_opts:
+            type: tmpfs
+            device: tmpfs
     acsbin-volume:
         driver: local
     acsdb-volume:
@@ -115,4 +182,3 @@ volumes:
         driver: local
     solrindex-volume:
         driver: local
-

nginx-ingress/entrypoint.sh

@@ -4,10 +4,18 @@ 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 [[ $ACS_SHARE_URL ]]; then
   sed -i s%http:\/\/share:8080%"$ACS_SHARE_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,6 +48,10 @@ 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/;
+        }
 
         location /share/ {
             proxy_pass http://share:8080;
@@ -55,5 +59,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;
+        }
     }
 }