Merge branch 'ags-frontend-enterprise' into dbp

.env

@@ -9,7 +9,10 @@ ACS_TAG=7.4.1.1
 ATR_TAG=3.0.0
 ATE_AIO_TAG=4.0.0
 ASFS_TAG=3.0.0
+APS_TAG=2.4.1
 AAMQ_TAG=latest
 POSTGRES_TAG=13
 ASIE_TAG=2.0.8.2
+ACS_SHARE_TAG=7.4.1.2
 ALF_SYNC_SERV_TAG=3.9.0
+ADW_TAG=4.1.0

README.md

@@ -11,3 +11,6 @@ This version of Alfresco requires licensing.
 
 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`.
 
+### APS
+
+APS requires a license file for it to work.  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/aps`.  The filename must be `activiti.lic`.  You can use symbolic linking if desired.

docker-compose.yml

@@ -27,6 +27,9 @@ services:
                 -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}
@@ -55,7 +58,6 @@ services:
             - shared-file-store
         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:${ATR_TAG}
@@ -81,6 +83,21 @@ services:
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
+    share:
+        image: quay.io/alfresco/alfresco-governance-share-enterprise:${ACS_SHARE_TAG}
+        environment:
+            REPO_HOST: "platform"
+            CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
+            CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?"
+            JAVA_OPTS: "
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                "
+    
     postgres-acs:
         image: postgres:${POSTGRES_TAG}
         environment:
@@ -88,8 +105,6 @@ services:
             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:${ASIE_TAG}
@@ -103,8 +118,6 @@ services:
                 "
         healthcheck:
             test: "curl -fsS http://localhost:8983/solr"
-        volumes:
-            - solrindex-volume:/opt/alfresco-search-services/data:rw
 
     activemq:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
@@ -112,8 +125,6 @@ services:
             ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
             ACTIVEMQ_ADMIN_LOGIN: alfresco
             ACTIVEMQ_ADMIN_PASSWORD: alfresco
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
 
     sync:
         image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
@@ -133,25 +144,73 @@ services:
             - postgres-acs
             - activemq
 
+    digital-workspace:
+        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
+        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"
+
+    activiti-app:
+        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+        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'
+            JAVA_OPTS: "-Xms128m -Xmx256m"
+        depends_on:
+            - postgres-aps
+        volumes:
+            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
+    
+    activiti-admin:
+        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        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: "-Xms64m -Xmx128m"
+        depends_on:
+            - postgres-aps-admin
+            - activiti-app
+    
+    postgres-aps:
+        image: postgres:${POSTGRES_TAG}
+        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:${POSTGRES_TAG}
+        environment:
+            POSTGRES_DB: activiti-admin
+            POSTGRES_USER: alfresco
+            POSTGRES_PASSWORD: alfresco
+        command: postgres -c max_connections=50 -c log_min_messages=LOG
+    
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-sync
+        image: local/nginx-ingress:acs-sync-share-adw-aps
         ports:
             - 8080:8080
         depends_on:
             - platform
             - sync
+            - share
+            - digital-workspace
+            - activiti-app
+            - activiti-admin
 
 volumes:
     shared-file-store-volume:
         driver_opts:
             type: tmpfs
             device: tmpfs
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local

nginx-ingress/entrypoint.sh

@@ -8,6 +8,22 @@ if [[ $ACS_SYNC_URL ]]; then
   sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $ACS_SHARE_URL ]]; then
+  sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf
+fi
+
+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 [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -52,5 +52,33 @@ http {
         location /sync/ {
             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;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+        
+        location /workspace/ {
+            proxy_pass http://digital-workspace:8080/;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }