From 7511eba729a81b8f4156c507ebfc6b1aa880ada0 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:54:47 -0400 Subject: [PATCH 1/2] added memory limit --- docker-compose.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 794f311..e46e807 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,8 +14,10 @@ services: -Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.password=oKIWzVdEdA - -Dmetadata-keystore.metadata.algorithm=DESede" + -Dmetadata-keystore.metadata.algorithm=DESede + " JAVA_OPTS: " + -Xms512m -Xmx1g -Ddb.driver=org.postgresql.Driver -Ddb.username=alfresco -Ddb.password=alfresco @@ -28,11 +30,9 @@ services: -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 - + -Dcors.enabled=false -Dtransform.service.enabled=false -Dlocal.transform.service.enabled=false - -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 -Djodconverter.enabled=false @@ -44,13 +44,17 @@ services: postgres-acs: image: postgres:${POSTGRES_TAG} environment: - - POSTGRES_PASSWORD=alfresco - - POSTGRES_USER=alfresco - - POSTGRES_DB=alfresco + POSTGRES_PASSWORD: alfresco + POSTGRES_USER: alfresco + POSTGRES_DB: alfresco command: postgres -c max_connections=300 -c log_min_messages=LOG activemq: image: alfresco/alfresco-activemq:${AAMQ_TAG} + environment: + ACTIVEMQ_OPTS_MEMORY: -Xms64m -Xmx256m + ACTIVEMQ_ADMIN_LOGIN: alfresco + ACTIVEMQ_ADMIN_PASSWORD: alfresco proxy: build: ./nginx-ingress From df452d73a0d0c9b07bf196eba047fd60c58e7c61 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Thu, 26 Oct 2023 14:13:48 -0400 Subject: [PATCH 2/2] removed mem_limit from proxy --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3e4726d..afa8110 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,6 @@ services: proxy: build: ./nginx-ingress image: local/nginx-ingress:acs - mem_limit: 256m ports: - 8080:8080 depends_on: