Merge branch 'acs' into acs-mysql

.env

@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+AAMQ_TAG=latest
+POSTGRES_TAG=13

docker-compose.yml

@@ -1,74 +1,62 @@
-# 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:
-    activiti-app:
+
-        image: alfresco/process-services:1.11.1.1
+    platform:
-        mem_limit: 512m
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
+            JAVA_TOOL_OPTIONS: "
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
+                -Dencryption.keystore.type=JCEKS
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+                -Dencryption.keyAlgorithm=DESede
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-            ACTIVITI_ES_SERVER_TYPE: rest
+                -Dmetadata-keystore.password=mp6yc0UD9e
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+                -Dmetadata-keystore.aliases=metadata
-            ACTIVITI_ES_REST_CLIENT_PORT: 9200
+                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
-            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
+                -Dmetadata-keystore.metadata.algorithm=DESede
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+                "
+            JAVA_OPTS: "
+                -Xms512m -Xmx1g
+                -Ddb.driver=com.mysql.jdbc.Driver
+                -Ddb.username=alfresco
+                -Ddb.password=alfresco
+                -Ddb.url=jdbc:mysql://mysql-acs:3306/alfresco?useUnicode=yes\\&characterEncoding=UTF-8\\&useSSL=false
+                -Dindex.subsystem.name=noindex
+                -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
+                -Dcsrf.filter.enabled=false
+                -Dcors.enabled=true
+                -Dcors.allowed.origins=http://localhost:4200,http://localhost:8080,${PROXY_PROTOCOL}://${PROXY_HOST}
+                -Dtransform.service.enabled=false
+                -Dlocal.transform.service.enabled=false
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
         depends_on:
-            - postgres-aps
+            - mysql-acs
-        volumes:
+            - activemq
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    activiti-admin:
+    mysql-acs:
-        image: alfresco/process-services-admin:1.11.1.1
+        image: mysql:5.7
-        mem_limit: 256m
         environment:
-            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            - MYSQL_RANDOM_ROOT_PASSWORD=true
-            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            - MYSQL_PASSWORD=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            - MYSQL_USER=alfresco
-            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            - MYSQL_DATABASE=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-            ACTIVITI_ADMIN_REST_APP_PORT: 8080
-            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
 
-    postgres-aps:
+    activemq:
-        image: postgres:11.6
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        mem_limit: 256m
         environment:
-            POSTGRES_DB: activiti
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-            POSTGRES_USER: alfresco
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            POSTGRES_PASSWORD: alfresco
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    postgres-aps-admin:
-        image: postgres:11.6
-        mem_limit: 128m
-        environment:
-            POSTGRES_DB: activiti-admin
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
-    
-    search-aps:
-        image: elasticsearch:7.6.0
-        mem_limit: 512m
-        environment:
-            discovery.type: single-node
-            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
-        depends_on:
-            - activiti-app
 
     proxy:
         build: ./nginx-ingress
@@ -76,5 +64,4 @@ services:
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin

nginx-ingress/entrypoint.sh

@@ -1,11 +1,7 @@
 #!/bin/sh
 
-if [[ $APS_APP_URL ]]; then
+if [[ $ACS_PLATFORM_URL ]]; then
-  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_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
 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/ {
+        location /alfresco/ {
-            proxy_pass http://activiti-app:8080;
+            proxy_pass http://platform: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;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;