Merge branch 'aps-base' into aps

.env

@@ -4,10 +4,3 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-
-ACS_TAG=7.4.1.1
-ATE_AIO_TAG=4.0.0
-AAMQ_TAG=latest
-POSTGRES_TAG=13
-ASIE_TAG=2.0.8.2
-ACS_SHARE_TAG=7.4.1.2

docker-compose.yml

@@ -1,130 +1,80 @@
-# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-version: "3"
+# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "2"
 
 services:
-
+    activiti-app:
-    platform:
+        image: alfresco/process-services:1.11.1.1
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        mem_limit: 512m
         environment:
-            JAVA_TOOL_OPTIONS: "
+            ACTIVITI_DATASOURCE_USERNAME: alfresco
-                -Dencryption.keystore.type=JCEKS
+            ACTIVITI_DATASOURCE_PASSWORD: alfresco
-                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
+            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
-                -Dencryption.keyAlgorithm=DESede
+            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
-                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
-                -Dmetadata-keystore.password=mp6yc0UD9e
+            ACTIVITI_ES_SERVER_TYPE: rest
-                -Dmetadata-keystore.aliases=metadata
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
-                -Dmetadata-keystore.metadata.password=oKIWzVdEdA
+            ACTIVITI_ES_REST_CLIENT_PORT: 9200
-                -Dmetadata-keystore.metadata.algorithm=DESede
+            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
-                "
+            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=solr6
-                -Dsolr.host=search
-                -Dsolr.secureComms=secret
-                -Dsolr.sharedSecret=alfresco-secret
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -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
-                -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
-                -Dcors.enabled=false
-                -Dtransform.service.enabled=false
-                -Dlocal.transform.service.enabled=true
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
-                "
         depends_on:
-            - mysql-acs
+            - postgres-aps
-            - activemq
         volumes:
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
-            - /usr/share/java/mysql.jar:/usr/local/tomcat/lib/mysql.jar:ro
     
-    transform-core-aio:
+    activiti-admin:
-        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+        image: alfresco/process-services-admin:1.11.1.1
+        mem_limit: 256m
+        environment:
+            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            ACTIVITI_ADMIN_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            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
     
-    share:
+    postgres-aps:
-        image: alfresco/alfresco-share:${ACS_SHARE_TAG}
+        image: postgres:11.6
+        mem_limit: 256m
         environment:
-            REPO_HOST: "platform"
+            POSTGRES_DB: activiti
-            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
+            POSTGRES_USER: alfresco
-            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
+            POSTGRES_PASSWORD: alfresco
-            JAVA_OPTS: "
+        command: postgres -c max_connections=300 -c log_min_messages=LOG
-                -Dshare.host=${PROXY_HOST}
-                -Dshare.port=${PROXY_PORT}
-                -Dshare.protocol=${PROXY_PROTOCOL}
-                -Dalfresco.host=${PROXY_HOST}
-                -Dalfresco.port=${PROXY_PORT}
-                -Dalfresco.protocol=${PROXY_PROTOCOL}
-                "
     
-    mysql-acs:
+    postgres-aps-admin:
-        image: mysql:5.7
+        image: postgres:11.6
+        mem_limit: 128m
         environment:
-            - MYSQL_RANDOM_ROOT_PASSWORD=true
+            POSTGRES_DB: activiti-admin
-            - MYSQL_PASSWORD=alfresco
+            POSTGRES_USER: alfresco
-            - MYSQL_USER=alfresco
+            POSTGRES_PASSWORD: alfresco
-            - MYSQL_DATABASE=alfresco
+        command: postgres -c max_connections=50 -c log_min_messages=LOG
-        volumes:
-            - acsdb-volume:/var/lib/mysql:rw
     
-    search:
+    search-aps:
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        image: elasticsearch:7.6.0
+        mem_limit: 512m
         environment:
-            SOLR_ALFRESCO_HOST: platform
+            discovery.type: single-node
-            SOLR_SOLR_HOST: search
+            ES_JAVA_OPTS: "-Xms128m -Xmx256m"
-            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
+        ulimits:
-            ALFRESCO_SECURE_COMMS: secret
+            memlock:
-            JAVA_TOOL_OPTIONS: "
+                soft: -1
-                -Dalfresco.secureComms.secret=alfresco-secret
+                hard: -1
-                "
+        depends_on:
-        healthcheck:
+            - activiti-app
-            test: "curl -fsS http://localhost:8983/solr"
-        volumes:
-            - solrindex-volume:/opt/alfresco-search-services/data:rw
-
-    activemq:
-        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        environment:
-            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-share
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
-            - platform
+            - activiti-app
-            - share
+            - activiti-admin
-
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local
-

nginx-ingress/entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [[ $ACS_PLATFORM_URL ]]; then
+if [[ $APS_APP_URL ]]; then
-  sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/activiti-app:8080%"$APS_APP_URL"%g /etc/nginx/nginx.conf
 fi
 
-if [[ $ACS_SHARE_URL ]]; then
+if [[ $APS_ADMIN_URL ]]; then
-  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+  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,18 @@ http {
         location ~ ^(/.*/s/prometheus)$ {return 403;}
         
         location / {
-            proxy_pass http://platform:8080;
+            return 301 $scheme://$http_host/activiti-app;
         }
 
-        location /alfresco/ {
+        location /activiti-app/ {
-            proxy_pass http://platform:8080;
+            proxy_pass http://activiti-app:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
 
-        location /share/ {
+        location /activiti-admin/ {
-            proxy_pass http://share:8080;
+            proxy_pass http://activiti-admin:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;