Compare commits

..

4 Commits

Author SHA1 Message Date
df5c4f1848 added insight engine/zeppelin 2021-08-05 15:29:43 -04:00
979924957c updated ASS memory limit min 2021-07-30 15:53:20 -04:00
2a4b61053d Merge branch 'acs' into acs-search 2021-07-30 15:52:35 -04:00
b8016f4ac7 updated ACS memory limits 2021-07-30 15:52:07 -04:00
3 changed files with 27 additions and 15 deletions

View File

@@ -5,7 +5,7 @@ version: "2"
services: services:
platform: platform:
image: alfresco/alfresco-governance-repository-community:V3.4-latest image: alfresco/alfresco-content-repository-community:6.2.0-ga
mem_limit: 1700m mem_limit: 1700m
environment: environment:
JAVA_OPTS: " JAVA_OPTS: "
@@ -23,16 +23,11 @@ services:
-Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE -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 -Dcsrf.filter.enabled=false
-XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-Dtransform.service.enabled=false -Dtransform.service.enabled=false
-Dlocal.transform.service.enabled=false
-Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.eagerOrphanCleanup=true
-Dsystem.content.orphanProtectDays=0 -Dsystem.content.orphanProtectDays=0
@@ -42,12 +37,9 @@ services:
- postgres-acs - postgres-acs
- activemq - activemq
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:2.3.6
postgres-acs: postgres-acs:
image: postgres:11.7 image: postgres:11.7
mem_limit: 512m mem_limit: 128m
environment: environment:
- POSTGRES_PASSWORD=alfresco - POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco - POSTGRES_USER=alfresco
@@ -55,8 +47,8 @@ services:
command: postgres -c max_connections=300 -c log_min_messages=LOG command: postgres -c max_connections=300 -c log_min_messages=LOG
search: 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: environment:
- SOLR_ALFRESCO_HOST=platform - SOLR_ALFRESCO_HOST=platform
- SOLR_ALFRESCO_PORT=8080 - SOLR_ALFRESCO_PORT=8080
@@ -65,14 +57,23 @@ services:
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
- ALFRESCO_SECURE_COMMS=none - 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: activemq:
image: alfresco/alfresco-activemq:5.15.8 image: alfresco/alfresco-activemq:5.15.8
mem_limit: 256m mem_limit: 512m
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs image: local/nginx-ingress:acs-insight
mem_limit: 256m
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on:
- platform - platform
- insight

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 sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf
fi fi
if [[ $INSIGHT_URL ]]; then
sed -i s%http:\/\/insight:9090%"$INSIGHT_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi fi

View File

@@ -48,5 +48,12 @@ http {
# If using external proxy / load balancer (for initial redirect if no trailing slash) # If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off; 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;
}
} }
} }