Merge branch 'aps-aims' into dbp-aims

.env

@@ -1,5 +1,4 @@
-EXTERNAL_RESOURCE_DIR=/home/brian
-ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
+ALFRESCO_DIR=~/alfresco
 ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http

docker-compose.yml

@@ -5,7 +5,7 @@ version: "2"
 
 services:
     platform:
-        image: alfresco/alfresco-content-repository:6.2.2.3
+        image: quay.io/alfresco/alfresco-governance-repository-enterprise:V3.4-latest
         mem_limit: 1700m
         environment:
             JAVA_OPTS: "
@@ -87,11 +87,8 @@ services:
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
-    
     share:
-        image: alfresco/alfresco-share:6.2.2
+        image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
         mem_limit: 512m
         environment:
             REPO_HOST: "platform"
@@ -175,6 +172,74 @@ services:
             APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
             APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: "/workspace/logout"
 
+    activiti-app:
+        image: alfresco/process-services:1.11.1.1
+        mem_limit: 512m
+        environment:
+            ACTIVITI_DATASOURCE_USERNAME: alfresco
+            ACTIVITI_DATASOURCE_PASSWORD: alfresco
+            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
+            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            ACTIVITI_ES_SERVER_TYPE: rest
+            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+            ACTIVITI_ES_REST_CLIENT_PORT: 9200
+            ACTIVITI_ES_REST_CLIENT_SCHEMA: http
+            IDENTITY_SERVICE_ENABLED: "true"
+            IDENTITY_SERVICE_AUTH: $IDENTITY_SERVICE_BASEURL/auth
+            JAVA_OPTS: "-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80"
+        depends_on:
+            - postgres-aps
+        volumes:
+            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+    
+    activiti-admin:
+        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
+    
+    postgres-aps:
+        image: postgres:11.6
+        mem_limit: 256m
+        environment:
+            POSTGRES_DB: activiti
+            POSTGRES_USER: alfresco
+            POSTGRES_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
+
     identity:
         image: alfresco/alfresco-identity-service:1.3
         user: jboss
@@ -190,10 +255,10 @@ services:
                     - "auth.example.org"
         volumes:
             - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
-
+    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync-share-adw-aims
+        image: local/nginx-ingress:acs-sync-share-adw-aps-aims
         ports:
             - 8080:8080
         depends_on:
@@ -201,6 +266,8 @@ services:
             - sync
             - share
             - digital-workspace
+            - activiti-app
+            - activiti-admin
             - identity
 
 volumes:

nginx-ingress/entrypoint.sh

@@ -16,6 +16,14 @@ if [[ $ADW_URL ]]; then
   sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
 fi
 
+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
+fi
+
 if [[ $AIMS_URL ]]; then
   sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -56,6 +56,20 @@ http {
             proxy_pass http://sync:9090/alfresco/;
         }
 
+        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;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+
         location /share/ {
             proxy_pass http://share:8080;
         }