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

.env

@@ -4,3 +4,10 @@ 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

docker-compose.yml

@@ -1,48 +1,63 @@
-# 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: "2"
+version: "3"
 
 services:
-    activiti-app:
-        image: alfresco/process-services:latest
+
+    platform:
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+            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=org.postgresql.Driver
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                "
         depends_on:
-            - postgres-aps
+            - postgres-acs
+            - activemq
+            - shared-file-store
+    
+    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:${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:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    activiti-admin:
-        image: alfresco/process-services-admin:latest
-        environment:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
+    postgres-acs:
+        image: postgres:${POSTGRES_TAG}
 
-    postgres-aps:
-        image: postgres:latest
-        environment:
-            POSTGRES_DB: activiti
-    
-    postgres-aps-admin:
-        image: postgres:latest
-        environment:
-            POSTGRES_DB: activiti-admin
-    
-    search-aps:
-        image: elasticsearch:latest
-        environment:
-            discovery.type: single-node
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
+    activemq:
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress
@@ -50,5 +65,10 @@ services:
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
-            - activiti-admin
+            - platform
+
+volumes:
+    shared-file-store-volume:
+        driver_opts:
+            type: tmpfs
+            device: tmpfs

nginx-ingress/entrypoint.sh

@@ -1,11 +1,7 @@
 #!/bin/sh
 
-if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
-fi
-
-if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
+if [[ $ACS_PLATFORM_URL ]]; then
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

@@ -39,18 +39,11 @@ http {
         location ~ ^(/.*/s/prometheus)$ {return 403;}
         
         location / {
-            return 301 $scheme://$http_host/activiti-app;
+            proxy_pass http://platform:8080;
         }
 
-        location /activiti-app/ {
-            proxy_pass http://activiti-app:8080;
-
-            # If using external proxy / load balancer (for initial redirect if no trailing slash)
-            absolute_redirect off;
-        }
-
-        location /activiti-admin/ {
-            proxy_pass http://activiti-admin:8080;
+        location /alfresco/ {
+            proxy_pass http://platform:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;