Merge branch 'acs-aims' into acs-aims-enterprise

.env

@@ -1,18 +1,8 @@
-ALFRESCO_DIR=~/alfresco
+EXTERNAL_RESOURCE_DIR=/home/brian
+ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
 ALFRESCO_LICENSE_DIR=~/alfresco/license
 
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-IDENTITY_SERVICE_PROTOCOL=http
-IDENTITY_SERVICE_HOST=auth.example.org
-IDENTITY_SERVICE_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
-APS_TAG=2.4.1
-AIS_TAG=1.8.0.1
-ACS_SHARE_TAG=7.4.1.2
+IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080

README.md

@@ -3,10 +3,3 @@
 
 This Git Repository intends to represent environments in Docker Compose.  All environments are effectively a derivative of other environments.  The original environment is the environment represented by the `base` branch.  All derivative environments are represented by other branches.  Those branches are named in the format `{core}.{parent}`.
 
-## Licensing
-
-This version of Alfresco requires licensing.
-
-### 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

@@ -1,32 +1,25 @@
-# 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:
-
     platform:
-        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
+        image: alfresco/alfresco-content-repository:6.2.2.3
+        mem_limit: 1700m
         environment:
-            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
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
@@ -40,108 +33,178 @@ services:
                 -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
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
+                -Dtransform.service.enabled=true
+                -Dlocal.transform.service.enabled=false
+
+                -Dtransform.service.url=http://transform-router:8095
+                -Dsfs.url=http://shared-file-store:8099
+                -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
+
                 -Dauthentication.chain=aims:identity-service,builtin:alfrescoNtlm
                 -Didentity-service.authentication.defaultAdministratorUserNames=admin.1
-                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_PROTOCOL}://${IDENTITY_SERVICE_HOST}:${IDENTITY_SERVICE_PORT}/auth
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
+                
                 -Dsystem.content.eagerOrphanCleanup=true
                 -Dsystem.content.orphanProtectDays=0
                 -Djodconverter.enabled=false
                 "
         depends_on:
-            postgres-acs:
-                condition: service_started
-            activemq:
-                condition: service_started
-            identity:
-                condition: service_healthy
+            - postgres-acs
+            - activemq
+            - shared-file-store
+        volumes:
+            - "$ALFRESCO_LICENSE_DIR/acs:/usr/local/tomcat/shared/classes/alfresco/extension/license:ro"
+    
+    transform-router:
+        image: quay.io/alfresco/alfresco-transform-router:1.3.1
+        environment:
+            ACTIVEMQ_URL: "nio://activemq:61616"
+            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:
+            - activemq
+            - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
+        image: alfresco/alfresco-transform-core-aio:2.3.6
+        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: alfresco/alfresco-shared-file-store:0.10.0
+        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
+        mem_limit: 512m
+        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}
+                -Daims.enabled=true
+                -Daims.realm=alfresco
+                -Daims.resource=acs-share
+                -Daims.authServerUrl=${IDENTITY_SERVICE_BASEURL}/auth
+                -Daims.sslRequired=none
+                -Daims.publicClient=true
+                -Daims.autodetectBearerOnly=true
+                -Daims.alwaysRefreshToken=true
+                -Daims.principalAttribute=preferred_username
+                -Daims.enableBasicAuth=true
+                "
     
     postgres-acs:
-        image: postgres:${POSTGRES_TAG}
+        image: postgres:11.7
+        mem_limit: 512m
         environment:
-            POSTGRES_PASSWORD: alfresco
-            POSTGRES_USER: alfresco
-            POSTGRES_DB: alfresco
+            - POSTGRES_PASSWORD=alfresco
+            - POSTGRES_USER=alfresco
+            - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
     
     search:
-        image: alfresco/alfresco-search-services:${ASIE_TAG}
+        image: alfresco/alfresco-search-services:2.0.1
+        mem_limit: 2g
         environment:
-            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"
+            - SOLR_ALFRESCO_HOST=platform
+            - SOLR_ALFRESCO_PORT=8080
+            - SOLR_SOLR_HOST=search
+            - SOLR_SOLR_PORT=8983
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
+            - ALFRESCO_SECURE_COMMS=none
 
     activemq:
-        image: alfresco/alfresco-activemq:${AAMQ_TAG}
-        environment:
-            ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m
-            ACTIVEMQ_ADMIN_LOGIN: alfresco
-            ACTIVEMQ_ADMIN_PASSWORD: alfresco
+        image: alfresco/alfresco-activemq:5.15.8
+        mem_limit: 256m
 
-    activiti-app:
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+    sync:
+        image: quay.io/alfresco/service-sync:3.3.3.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'
-            IDENTITY_SERVICE_ENABLED: "true"
-            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: "-Xms128m -Xmx256m"
+            JAVA_OPTS : "
+                -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
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+                -Didentity-service.auth-server-url=${IDENTITY_SERVICE_BASEURL}/auth
+                -Didentity-service.resource=acs-sync
+                "
         depends_on:
-            - postgres-aps
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
-    
-    postgres-aps:
-        image: postgres:${POSTGRES_TAG}
+            - postgres-acs
+            - activemq
+
+    digital-workspace:
+        image: quay.io/alfresco/alfresco-digital-workspace:2.0.0-adw
+        mem_limit: 128m
         environment:
-            POSTGRES_DB: activiti
-            POSTGRES_USER: alfresco
-            POSTGRES_PASSWORD: alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
+            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_AUTH_TYPE: OAUTH
+            APP_CONFIG_OAUTH2_HOST: "${IDENTITY_SERVICE_BASEURL}/auth/realms/alfresco"
+            APP_CONFIG_OAUTH2_CLIENTID: alfresco
+            APP_CONFIG_OAUTH2_IMPLICIT_FLOW: "true"
+            APP_CONFIG_OAUTH2_REDIRECT_LOGIN: "/workspace/"
+            APP_CONFIG_OAUTH2_REDIRECT_LOGOUT: "/workspace/logout"
+
     identity:
-        image: alfresco/alfresco-identity-service:${AIS_TAG}
+        image: alfresco/alfresco-identity-service:1.3
         user: jboss
         environment:
             KEYCLOAK_USER: admin
             KEYCLOAK_PASSWORD: admin
-            KEYCLOAK_HOSTNAME: ${IDENTITY_SERVICE_HOST}
+            KEYCLOAK_HOSTNAME: auth.example.org
             KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
             KEYCLOAK_STATISTICS: enabled
         networks:
             default:
                 aliases:
-                    - "${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
+                    - "auth.example.org"
         volumes:
             - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
-    
+
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs-aps-aims
+        image: local/nginx-ingress:acs-sync-share-adw-aims
         ports:
             - 8080:8080
         depends_on:
             - platform
-            - activiti-app
+            - sync
+            - share
+            - digital-workspace
             - identity
+
+volumes:
+    shared-file-store-volume:
+        driver_opts:
+            type: tmpfs
+            device: tmpfs

keycloak-alfresco-realm.json

@@ -42,6 +42,24 @@
       "attributes": {
         "login_theme": "alfresco"
       }
+    },
+    {
+      "clientId": "acs-sync",
+      "name": "Alfresco Sync Service Clients",
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "redirectUris": [
+        "http://127.0.0.1*",
+        "http://localhost*"
+      ],
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": false,
+      "directAccessGrantsEnabled": false,
+      "publicClient": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "login_theme": "alfresco"
+      }
     }
   ],
   "requiredCredentials": [ "password" ],

nginx-ingress/entrypoint.sh

@@ -4,8 +4,16 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_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
+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 [[ $AIMS_URL ]]; then

nginx-ingress/nginx.conf

@@ -47,10 +47,21 @@ http {
 
         location /alfresco/ {
             proxy_pass http://platform:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+        
+        location /sync/ {
+            proxy_pass http://sync:9090/alfresco/;
         }
 
-        location /activiti-app/ {
-            proxy_pass http://activiti-app:8080;
+        location /share/ {
+            proxy_pass http://share:8080;
+        }
+        
+        location /workspace/ {
+            proxy_pass http://digital-workspace:8080/;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;