added insight engine/zeppelin

.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

docker-compose.yml

@@ -1,73 +1,79 @@
-# 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-community:6.2.0-ga
-        image: quay.io/alfresco/alfresco-process-services:${APS_TAG}
+        mem_limit: 1700m
         environment:
-            ACTIVITI_DATASOURCE_USERNAME: alfresco
+            JAVA_OPTS: "
-            ACTIVITI_DATASOURCE_PASSWORD: alfresco
+                -Ddb.driver=org.postgresql.Driver
-            ACTIVITI_DATASOURCE_DRIVER: org.postgresql.Driver
+                -Ddb.username=alfresco
-            ACTIVITI_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect
+                -Ddb.password=alfresco
-            ACTIVITI_DATASOURCE_URL: 'jdbc:postgresql://postgres-aps:5432/activiti?characterEncoding=UTF-8'
+                -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-            JAVA_OPTS: "-Xms128m -Xmx256m"
+                -Dindex.subsystem.name=solr6
+                -Dsolr.host=search
+                -Dsolr.port=8983
+                -Dsolr.secureComms=none
+                -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
+                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
+
+                -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
-        volumes:
+            - activemq
-            - "$ALFRESCO_LICENSE_DIR/aps:/home/alfresco/.activiti/enterprise-license:ro"
-            - apsbin-volume:/var/lib/postgresql/data:rw
     
-    activiti-admin:
+    postgres-acs:
-        image: quay.io/alfresco/alfresco-process-services-admin:${APS_TAG}
+        image: postgres:11.7
+        mem_limit: 128m
         environment:
-            ACTIVITI_ADMIN_DATASOURCE_USERNAME: alfresco
+            - POSTGRES_PASSWORD=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_PASSWORD: alfresco
+            - POSTGRES_USER=alfresco
-            ACTIVITI_ADMIN_DATASOURCE_DRIVER: org.postgresql.Driver
+            - POSTGRES_DB=alfresco
-            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
         command: postgres -c max_connections=300 -c log_min_messages=LOG
-        volumes:
-            - apsdb-volume:/var/lib/postgresql/data:rw
     
-    postgres-aps-admin:
+    search:
-        image: postgres:${POSTGRES_TAG}
+        image: quay.io/alfresco/insight-engine:2.0.1
+        mem_limit: 1g
         environment:
-            POSTGRES_DB: activiti-admin
+            - SOLR_ALFRESCO_HOST=platform
-            POSTGRES_USER: alfresco
+            - SOLR_ALFRESCO_PORT=8080
-            POSTGRES_PASSWORD: alfresco
+            - SOLR_SOLR_HOST=search
-        command: postgres -c max_connections=50 -c log_min_messages=LOG
+            - SOLR_SOLR_PORT=8983
-        volumes:
+            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            - apsadmindb-volume:/var/lib/postgresql/data:rw
+            - ALFRESCO_SECURE_COMMS=none
+    
+    insight:
+        image: quay.io/alfresco/insight-zeppelin:2.0.1
+        mem_limit: 1g
+        environment:
+            - REPO_HOST=platform
+            - REPO_PORT=8080
+
+    activemq:
+        image: alfresco/alfresco-activemq:5.15.8
+        mem_limit: 512m
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:aps
+        image: local/nginx-ingress:acs-insight
         mem_limit: 256m
         ports:
             - 8080:8080
         depends_on:
-            - activiti-app
+            - platform
-            - activiti-admin
+            - insight
-
-volumes:
-    apsbin-volume:
-        driver: local
-    apsdb-volume:
-        driver: local
-    apsadmindb-volume:
-        driver: local

nginx-ingress/entrypoint.sh

@@ -1,11 +1,11 @@
 #!/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 [[ $INSIGHT_URL ]]; then
-  sed -i s%http:\/\/activiti-admin:8080%"$APS_ADMIN_URL"%g /etc/nginx/nginx.conf
+  sed -i s%http:\/\/insight:9090%"$INSIGHT_URL"%g /etc/nginx/nginx.conf
 fi
 
 if [[ $ACCESS_LOG ]]; then

nginx-ingress/nginx.conf

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