added insight engine/zeppelin

docker-compose.yml

@@ -23,16 +23,11 @@ services:
                 -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
-                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-                -Djodconverter.url=http://transform-core-aio:8090/
-                -Dimg.url=http://transform-core-aio:8090/
-                -Dtika.url=http://transform-core-aio:8090/
-                -Dtransform.misc.url=http://transform-core-aio:8090/
                 -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
@@ -41,26 +36,19 @@ services:
         depends_on:
             - postgres-acs
             - activemq
-        volumes:
-            - acsbin-volume:/usr/local/tomcat/alf_data:rw
-    
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
     
     postgres-acs:
         image: postgres:11.7
-        mem_limit: 512m
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
             - POSTGRES_DB=alfresco
         command: postgres -c max_connections=300 -c log_min_messages=LOG
-        volumes:
-            - acsdb-volume:/var/lib/postgresql/data:rw
     
     search:
-        image: alfresco/alfresco-search-services:2.0.1
+        image: quay.io/alfresco/insight-engine:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
@@ -68,29 +56,24 @@ services:
             - SOLR_SOLR_PORT=8983
             - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
             - ALFRESCO_SECURE_COMMS=none
-        volumes:
+    
-            - solrindex-volume:/opt/alfresco-search-services/data:rw
+    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: 256m
+        mem_limit: 512m
-        volumes:
-            - activemq-volume:/opt/activemq/data:rw
 
     proxy:
         build: ./nginx-ingress
-        image: local/nginx-ingress:acs
+        image: local/nginx-ingress:acs-insight
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on:
             - platform
-
+            - insight
-volumes:
-    acsbin-volume:
-        driver: local
-    acsdb-volume:
-        driver: local
-    activemq-volume:
-        driver: local
-    solrindex-volume:
-        driver: local

nginx-ingress/entrypoint.sh

@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
   sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
 fi
 
+if [[ $INSIGHT_URL ]]; then
+  sed -i s%http:\/\/insight:9090%"$INSIGHT_URL"%g /etc/nginx/nginx.conf
+fi
+
 if [[ $ACCESS_LOG ]]; then
   sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
 fi

nginx-ingress/nginx.conf

@@ -48,5 +48,12 @@ http {
             # If using external proxy / load balancer (for initial redirect if no trailing slash)
             absolute_redirect off;
         }
+
+        location /zeppelin/ {
+            proxy_pass http://insight:9090;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
     }
 }