diff --git a/docker-compose.yml b/docker-compose.yml index 8735bc2..587efc2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: command: postgres -c max_connections=300 -c log_min_messages=LOG search: - image: alfresco/alfresco-search-services:2.0.1 + image: quay.io/alfresco/insight-engine:2.0.1 mem_limit: 1g environment: - SOLR_ALFRESCO_HOST=platform @@ -56,6 +56,13 @@ services: - SOLR_SOLR_PORT=8983 - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive - 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 @@ -63,9 +70,10 @@ services: 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 diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 3dc2e8e..903a6fa 100644 --- a/nginx-ingress/entrypoint.sh +++ b/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 diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 01564f8..1857e5a 100644 --- a/nginx-ingress/nginx.conf +++ b/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; + } } }