Merge branch 'acs-search' into acs-search-persist

.env

@@ -5,5 +5,7 @@ PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
 
-APS_TAG=2.4.1
+ACS_TAG=7.4.1.1
+AAMQ_TAG=latest
 POSTGRES_TAG=13
+ASIE_TAG=2.0.8.2

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

@@ -4,69 +4,97 @@ version: "3"
 
 services:
 
-    activiti-app:
+    platform:
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+        image: alfresco/alfresco-content-repository-community:${ACS_TAG}
         environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
+            JAVA_TOOL_OPTIONS: "
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
+                -Dencryption.keystore.type=JCEKS
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
+                -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+                -Dencryption.keyAlgorithm=DESede
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+                -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-            JAVA_OPTS: "-Xms128m -Xmx256m"
+                -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
+                -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=false
+                -Dlocal.transform.service.enabled=false
+                -Dsystem.content.eagerOrphanCleanup=true
+                -Dsystem.content.orphanProtectDays=0
+                -Djodconverter.enabled=false
+                "
         depends_on:
-            - postgres-aps
+            - postgres-acs
+            - activemq
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
-            - apsbin-volume:/var/lib/postgresql/data:rw
     
-    activiti-admin:
+    postgres-acs:
-        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
+            POSTGRES_USER: alfresco
+            POSTGRES_DB: alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
         volumes:
-            - apsdb-volume:/var/lib/postgresql/data:rw
+            - acsdb-volume:/var/lib/postgresql/data:rw
     
-    postgres-aps-admin:
+    search:
-        image: postgres:${POSTGRES_TAG}
+        image: alfresco/alfresco-search-services:${ASIE_TAG}
         environment:
-            POSTGRES_DB: activiti-admin
+            SOLR_ALFRESCO_HOST: platform
-            POSTGRES_USER: alfresco
+            SOLR_SOLR_HOST: search
-            POSTGRES_PASSWORD: alfresco
+            SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
+            ALFRESCO_SECURE_COMMS: secret
+            JAVA_TOOL_OPTIONS: "
+                -Dalfresco.secureComms.secret=alfresco-secret
+                "
+        healthcheck:
+            test: "curl -fsS http://localhost:8983/solr"
         volumes:
-            - apsadmindb-volume:/var/lib/postgresql/data:rw
+            - 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:aps
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin
 
 volumes:
-    apsbin-volume:
+    acsbin-volume:
         driver: local
-    apsdb-volume:
+    acsdb-volume:
         driver: local
-    apsadmindb-volume:
+    activemq-volume:
+        driver: local
+    solrindex-volume:
         driver: local

nginx-ingress/entrypoint.sh

@@ -1,11 +1,7 @@
 #!/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
-  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,11 @@ 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/ {
-            proxy_pass http://activiti-admin:8080;
 
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;