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

.env

@@ -4,6 +4,3 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
-
-APS_TAG=2.4.1
-POSTGRES_TAG=13

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,42 +1,58 @@
-# 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:
-    activiti-app:
+        image: alfresco/alfresco-content-repository:latest
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
         environment:
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+            JAVA_OPTS: "
+                -Ddb.driver=org.postgresql.Driver
+                -Dsolr.host=search
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
+                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
+                "
         depends_on:
-            - postgres-aps
+            - postgres-acs
+            - activemq
         volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
+            - acsbin-volume:/usr/local/tomcat/alf_data:rw
     
-    activiti-admin:
+    postgres-acs:
-        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        image: postgres:latest
-        environment:
+        volumes:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
+            - acsdb-volume:/var/lib/postgresql/data:rw
-            ACTIVITI_ADMIN_REST_APP_HOST: http://activiti-app
-        depends_on:
-            - postgres-aps-admin
-            - activiti-app
     
-    postgres-aps:
+    search:
-        image: postgres:${POSTGRES_TAG}
+        image: alfresco/alfresco-search-services:latest
         environment:
-            POSTGRES_DB: activiti
+            - SOLR_ALFRESCO_HOST=platform
-    
+            - SOLR_SOLR_HOST=search
-    postgres-aps-admin:
+        volumes:
-        image: postgres:${POSTGRES_TAG}
+            - solrindex-volume:/opt/alfresco-search-services/data:rw
-        environment:
+
-            POSTGRES_DB: activiti-admin
+    activemq:
+        image: alfresco/alfresco-activemq:latest
+        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:
+    acsbin-volume:
+        driver: local
+    acsdb-volume:
+        driver: local
+    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;