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

.env

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

docker-compose.yml

@@ -1,53 +1,40 @@
-# 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: "
-            ACTIVITI_ES_REST_CLIENT_ADDRESS: search-aps
+                -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
-            - search-aps
+            - activemq
-        volumes:
-            - "$ALFRESCO_LICENSE_DIR/aps:/root/.activiti/enterprise-license:ro"
     
-    activiti-admin:
+    postgres-acs:
-        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        image: postgres:latest
-        environment:
-            ACTIVITI_ADMIN_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps-admin:5432/activiti-admin?characterEncoding=UTF-8'
-            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:
+    activemq:
-        image: postgres:${POSTGRES_TAG}
+        image: alfresco/alfresco-activemq:latest
-        environment:
-            POSTGRES_DB: activiti-admin
-    
-    search-aps:
-        image: elasticsearch:${ELASTICSEARCH_TAG}
-        environment:
-            discovery.type: single-node
-        ulimits:
-            memlock:
-                soft: -1
-                hard: -1
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:aps
+        image: local/nginx-ingress:acs
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin

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;