Compare commits

..
4 changed files with 27 additions and 8 deletions
+2 -3
View File
@@ -1,6 +1,5 @@
EXTERNAL_RESOURCE_DIR=~
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
ALFRESCO_DIR=~/alfresco
ALFRESCO_LICENSE_DIR=~/alfresco/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
+14 -5
View File
@@ -39,7 +39,7 @@ services:
postgres-acs:
image: postgres:11.7
mem_limit: 512m
mem_limit: 128m
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
@@ -47,8 +47,8 @@ services:
command: postgres -c max_connections=300 -c log_min_messages=LOG
search:
image: alfresco/alfresco-search-services:2.0.1
mem_limit: 2g
image: quay.io/alfresco/insight-engine:2.0.1
mem_limit: 1g
environment:
- SOLR_ALFRESCO_HOST=platform
- SOLR_ALFRESCO_PORT=8080
@@ -56,15 +56,24 @@ 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
mem_limit: 256m
mem_limit: 512m
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
+4
View File
@@ -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
+7
View File
@@ -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;
}
}
}