Merge branch 'acs-backend-enterprise' into acs-frontend-enterprise

Merge branch 'acs-frontend' into acs-frontend-enterprise
Merge branch 'acs-backend' into acs-frontend
2023-10-26 14:38:13 -04:00 · 2023-10-26 14:37:45 -04:00 · 2023-10-26 14:35:58 -04:00 · 2023-10-26 14:35:02 -04:00 · 2023-10-26 14:34:56 -04:00 · 2023-10-26 14:31:57 -04:00
5 changed files with 189 additions and 34 deletions
--- a/.env
+++ b/.env
@@ -5,5 +5,13 @@ PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-APS_TAG=2.4.1
+ACS_TAG=7.4.1.1
 ATR_TAG=3.0.0
 ATE_AIO_TAG=4.0.0
 ASFS_TAG=3.0.0
 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
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ This Git Repository intends to represent environments in Docker Compose.  All en
 This version of Alfresco requires licensing.
-### APS
+### 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`.
 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.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,39 +4,166 @@ version: "3"
 services:
-    activiti-app:
+    platform:
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+        image: quay.io/alfresco/alfresco-content-repository:${ACS_TAG}
        environment:
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            JAVA_TOOL_OPTIONS: "
                -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=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
                -Dcsrf.filter.enabled=false
                -Dcors.enabled=false
                -Dtransform.service.enabled=true
                -Dtransform.service.url=http://transform-router:8095
                -Dsfs.url=http://shared-file-store:8099
                -Dlocal.transform.service.enabled=true
                -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090
                -Djodconverter.url=http://transform-engine-aio:8090
                -Dimg.url=http://transform-engine-aio:8090
                -Dtika.url=http://transform-engine-aio:8090
                -Dtransform.misc.url=http://transform-engine-aio:8090
                -Ddsync.service.uris=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/sync
                -Dsystem.content.eagerOrphanCleanup=true
                -Dsystem.content.orphanProtectDays=0
                -Djodconverter.enabled=false
                "
        depends_on:
-            - postgres-aps
+            - postgres-acs
            - activemq
            - shared-file-store
        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:
+    transform-router:
-        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
        environment:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            ACTIVEMQ_URL: "nio://activemq:61616"
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
+            CORE_AIO_URL : "http://transform-core-aio:8090"
            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
        depends_on:
-            - postgres-aps-admin
+            - activemq
-            - activiti-app
+            - shared-file-store
-    postgres-aps:
+    transform-core-aio:
        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
        environment:
            ACTIVEMQ_URL: "nio://activemq:61616"
            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
        depends_on:
            - activemq
            - shared-file-store
    shared-file-store:
        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
        volumes:
            - shared-file-store-volume:/tmp/Alfresco/sfs
    share:
        image: alfresco/alfresco-share:${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:
-            POSTGRES_DB: activiti
+            POSTGRES_PASSWORD: alfresco
            POSTGRES_USER: alfresco
            POSTGRES_DB: alfresco
        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    postgres-aps-admin:
+    search:
-        image: postgres:${POSTGRES_TAG}
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
        environment:
-            POSTGRES_DB: activiti-admin
+            SOLR_ALFRESCO_HOST: platform
            SOLR_SOLR_HOST: search
            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
            ALFRESCO_SECURE_COMMS: secret
            JAVA_TOOL_OPTIONS: "
                -Dalfresco.secureComms.secret=alfresco-secret
                "
        healthcheck:
            test: "curl -fsS http://localhost:8983/solr"
    activemq:
        image: alfresco/alfresco-activemq:${AAMQ_TAG}
        environment:
            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
            ACTIVEMQ_ADMIN_LOGIN: alfresco
            ACTIVEMQ_ADMIN_PASSWORD: alfresco
    sync:
        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
        environment:
            JAVA_OPTS : "
                -Xms64m -Xmx256m
                -Dsql.db.driver=org.postgresql.Driver
                -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco
                -Dsql.db.username=alfresco
                -Dsql.db.password=alfresco
                -Dmessaging.broker.host=activemq
                -Drepo.hostname=platform
                -Drepo.port=8080
                -Ddw.server.applicationConnectors[0].type=http
                "
        depends_on:
            - 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"
    proxy:
        build: ./nginx-ingress
-        image: local/nginx-ingress:aps
+        image: local/nginx-ingress:acs-sync-share-adw
        ports:
            - 8080:8080
        depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin
+            - sync
            - share
            - digital-workspace
 volumes:
    shared-file-store-volume:
        driver_opts:
            type: tmpfs
            device: tmpfs
--- a/nginx-ingress/entrypoint.sh
+++ b/nginx-ingress/entrypoint.sh
@@ -1,11 +1,19 @@
 #!/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
+if [[ $ACS_SYNC_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
+  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 [[ $ACCESS_LOG ]]; then
--- a/nginx-ingress/nginx.conf
+++ b/nginx-ingress/nginx.conf
@@ -39,18 +39,29 @@ 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/ {
+        location /sync/ {
-            proxy_pass http://activiti-admin:8080;
+            proxy_pass http://sync:9090/alfresco/;
        }
        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;