Merge branch 'acs-enterprise' into ags-enterprise

.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

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,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: "3"
-version: "2"
 
 services:
-    activiti-app:
+
-        image: alfresco/process-services:latest
+    platform:
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:${ACS_TAG}
         environment:
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            JAVA_TOOL_OPTIONS: "
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+                -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.username=alfresco
+                -Ddb.password=alfresco
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
+                -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=false
+                -Dtransform.service.enabled=false
+                -Dlocal.transform.service.enabled=false
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
         depends_on:
-            - postgres-aps
+            - postgres-acs
+            - activemq
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
     
-    activiti-admin:
+    postgres-acs:
-        image: alfresco/process-services-admin:latest
+        image: postgres:${POSTGRES_TAG}
         environment:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            POSTGRES_PASSWORD: alfresco
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
+            POSTGRES_USER: alfresco
-        depends_on:
+            POSTGRES_DB: alfresco
-            - postgres-aps-admin
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
-            - activiti-app
+
-    
+    activemq:
-    postgres-aps:
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        image: postgres:latest
         environment:
-            POSTGRES_DB: activiti
+            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-    
+            ACTIVEMQ_ADMIN_LOGIN: alfresco
-    postgres-aps-admin:
+            ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        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
 
     proxy:
         build: ./nginx-ingress
@@ -50,5 +65,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;