Merge branch 'dbp-persist' into dbp-persist-aims

.env

@@ -4,4 +4,6 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080
+IDENTITY_SERVICE_PROTOCOL=http
+IDENTITY_SERVICE_HOST=auth.example.org
+IDENTITY_SERVICE_PORT=8080

docker-compose.yml

@@ -1,12 +1,12 @@
 # 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: "2.1"
 
 services:
     platform:
         image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
-        mem_limit: 1700m
+        mem_limit: 2g
         environment:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
@@ -50,21 +50,28 @@ services:
 
                 -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
                 -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
-                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
                 
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            - postgres-acs
+            postgres-acs:
-            - activemq
+                condition: service_started
-            - shared-file-store
+            activemq:
+                condition: service_started
+            shared-file-store:
+                condition: service_started
+            identity:
+                condition: service_healthy
         volumes:
             - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
     transform-router:
         image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        mem_limit: 128m
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -75,6 +82,7 @@ services:
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+        mem_limit: 1g
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -84,6 +92,7 @@ services:
 
     shared-file-store:
         image: alfresco/alfresco-shared-file-store:0.10.0
+        mem_limit: 256m
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
@@ -104,7 +113,7 @@ services:
                 -Daims.enabled=true
                 -Daims.realm=alfresco
                 -Daims.resource=acs-share
-                -Daims.authServerUrl=${IDENTITY_SERVICE_BASEURL}/auth
+                -Daims.authServerUrl=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
                 -Daims.sslRequired=none
                 -Daims.publicClient=true
                 -Daims.autodetectBearerOnly=true
@@ -115,16 +124,18 @@ services:
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
@@ -132,10 +143,14 @@ services:
             - SOLR_SOLR_PORT=8983
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
+        volumes:
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        mem_limit: 512m
+        volumes:
+            - activemq-volume:/opt/activemq/data:rw
 
     sync:
         image: quay.io/alfresco/service-sync:3.3.3.1
@@ -151,7 +166,7 @@ services:
                 -Drepo.port=8080
                 -Ddw.server.applicationConnectors[0].type=http
                 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
                 -Didentity-service.resource=acs-sync
                 "
         depends_on:
@@ -164,9 +179,13 @@ services:
         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"
+            APP_CONFIG_BPM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
+            APP_BASE_SHARE_URL: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/workspace/#/preview/s"
+            APP_CONFIG_PROVIDER: "ALL"
+            APP_CONFIG_PLUGIN_PROCESS_SERVICE: "true"
+            #APP_CONFIG_PLUGIN_PROCESS_AUTOMATION: "true"
             APP_CONFIG_AUTH_TYPE: OAUTH
-            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_BASEURL}/auth/realms/alfresco"
+            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth/realms/alfresco"
             APP_CONFIG_OAUTH2_CLIENTID: alfresco
             APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
             APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
@@ -186,12 +205,14 @@ services:
             ACTIVITI_ES_REST_CLIENT_PORT: 9200
             ACTIVITI_ES_REST_CLIENT_SCHEMA: http
             IDENTITY_SERVICE_ENABLED: "true"
-            IDENTITY_SERVICE_AUTH: $IDENTITY_SERVICE_BASEURL/auth
+            IDENTITY_SERVICE_AUTH: ${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+            IDENTITY_SERVICE_CONTENT_SSO_REDIRECT_URI: ${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/activiti-app/app/rest/integration/sso/confirm-auth-request
             JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
         depends_on:
             - postgres-aps
         volumes:
             - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - apsbin-volume:/var/lib/postgresql/data:rw
     
     activiti-admin:
         image: alfresco/process-services-admin:1.11.1.1
@@ -211,12 +232,14 @@ services:
     
     postgres-aps:
         image: postgres:11.6
-        mem_limit: 256m
+        mem_limit: 128m
         environment:
             POSTGRES_DB: activiti
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
+        volumes:
+            - apsdb-volume:/var/lib/postgresql/data:rw
     
     postgres-aps-admin:
         image: postgres:11.6
@@ -226,6 +249,8 @@ services:
             POSTGRES_USER: alfresco
             POSTGRES_PASSWORD: alfresco
         command: postgres -c max_connections=50 -c log_min_messages=LOG
+        volumes:
+            - apsadmindb-volume:/var/lib/postgresql/data:rw
     
     search-aps:
         image: elasticsearch:7.6.0
@@ -239,26 +264,37 @@ services:
                 hard: -1
         depends_on:
             - activiti-app
+        volumes:
+            - esindex-volume:/var/lib/postgresql/data:rw
 
     identity:
-        image: alfresco/alfresco-identity-service:1.3
+        image: alfresco/alfresco-identity-service:1.4.0
+        mem_limit: 512m
         user: jboss
         environment:
             KEYCLOAK_USER: admin
             KEYCLOAK_PASSWORD: admin
-            KEYCLOAK_HOSTNAME: auth.example.org
+            KEYCLOAK_HOSTNAME: ${IDENTITY_SERVICE_HOST}
             KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
             KEYCLOAK_STATISTICS: enabled
         networks:
             default:
                 aliases:
-                    - "auth.example.org"
+                    - "${IDENTITY_SERVICE_HOST}"
+        healthcheck:
+            test: ["CMD", "curl", "-f", "http://localhost:8080/auth/realms/alfresco"]
+            interval: 10s
+            timeout: 10s
+            # Really long startup times on Windows
+            retries: 18
         volumes:
             - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
+            - keycloak-volume:/opt/jboss/keycloak/standalone/data:rw
     
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-sync-share-adw-aps-aims
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on:
@@ -275,3 +311,21 @@ volumes:
         driver_opts:
             type: tmpfs
             device: tmpfs
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    activemq-volume:
+        driver: local
+    solrindex-volume:
+        driver: local
+    apsbin-volume:
+        driver: local
+    apsdb-volume:
+        driver: local
+    apsadmindb-volume:
+        driver: local
+    esindex-volume:
+        driver: local
+    keycloak-volume:
+        driver: local