From 723f3ec9547e9a53de0102b3f875a3e9cb674201 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:55:00 -0500 Subject: [PATCH 01/12] configured for ACS community v6.2.2-RC1 --- docker-compose.yml | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..cdb5faa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,16 +5,50 @@ version: "2" services: alfresco: - image: alfresco/alfresco-content-repository:latest + image: alfresco/alfresco-content-repository-community:6.2.2-RC1 + mem_limit: 1700m + environment: + JAVA_OPTS: " + -Ddb.driver=org.postgresql.Driver + -Ddb.username=alfresco + -Ddb.password=alfresco + -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dindex.subsystem.name=noindex + -Dalfresco.host=localhost + -Dalfresco.port=8080 + -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -Ddeployment.method=DOCKER_COMPOSE + + -Dtransform.service.enabled=false + -Dlocal.transform.service.enabled=false + + -Dcsrf.filter.enabled=false + -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 + -Dsystem.content.eagerOrphanCleanup=true + -Dsystem.content.orphanProtectDays=0 + " postgres-acs: - image: postgres:latest + image: postgres:11.4 + mem_limit: 512m + environment: + - 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:latest + image: alfresco/alfresco-activemq:5.15.8 + mem_limit: 1g + ports: + - 8161:8161 # HTTP + - 5672:5672 # AMQP + - 61616:61616 # OpenWire + - 61613:61613 # STOMP proxy: - image: alfresco/alfresco-acs-nginx:latest + image: alfresco/alfresco-acs-nginx:3.0.2 depends_on: - alfresco ports: From 90e935a49ee34c3acc9b920103001dd46dbfa36c Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:22:05 -0500 Subject: [PATCH 02/12] minor fixes --- docker-compose.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fa6a9a0..64866bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,12 +19,12 @@ services: -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -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 -Dtransform.service.enabled=false -Dlocal.transform.service.enabled=false - -Dcsrf.filter.enabled=false - -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 " @@ -33,7 +33,7 @@ services: - activemq postgres-acs: - image: postgres:11.4 + image: postgres:11.7 mem_limit: 512m environment: - POSTGRES_PASSWORD=alfresco @@ -43,12 +43,7 @@ services: activemq: image: alfresco/alfresco-activemq:5.15.8 - mem_limit: 1g - ports: - - 8161:8161 # HTTP - - 5672:5672 # AMQP - - 61616:61616 # OpenWire - - 61613:61613 # STOMP + mem_limit: 256m proxy: image: alfresco/alfresco-acs-nginx:3.0.2 From c22af67a06a884c5c80339d34f546512c691f6cb Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 18:53:34 -0500 Subject: [PATCH 03/12] disabled jodconverter in platform --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4969ee2..a61abca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 + -Djodconverter.enabled=false " depends_on: - postgres-acs From 60b5a8989b8ddce6ddb6ee71ca07756d168db1d8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 20:42:54 -0500 Subject: [PATCH 04/12] changed from v6.2.2-RC1 to v6.2.0-ga --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a61abca..0008e2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ version: "2" services: platform: - image: alfresco/alfresco-content-repository-community:6.2.2-RC1 + image: alfresco/alfresco-content-repository-community:6.2.0-ga mem_limit: 1700m environment: JAVA_OPTS: " From 1d0aa0c91e1144f9d3074f633a32bfadd179a25e Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 21:00:27 -0500 Subject: [PATCH 05/12] fixed solr configuration on platform --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index b168192..0230a07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dindex.subsystem.name=solr6 -Dsolr.host=search + -Dsolr.port=8983 + -Dsolr.secureComms=none -Dalfresco.host=localhost -Dalfresco.port=8080 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos From d70efc69437c46942b7a46e9fd32ac7bcc42991b Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:19:41 -0500 Subject: [PATCH 06/12] parameterized AOS --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e667690..31f70e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} - -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos + -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 -Dcsrf.filter.enabled=false From b8016f4ac74baf23c319654c153c72eda7443150 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 30 Jul 2021 15:52:07 -0400 Subject: [PATCH 07/12] updated ACS memory limits --- docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 31f70e7..18940f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: postgres-acs: image: postgres:11.7 - mem_limit: 512m + mem_limit: 128m environment: - POSTGRES_PASSWORD=alfresco - POSTGRES_USER=alfresco @@ -45,11 +45,12 @@ services: activemq: image: alfresco/alfresco-activemq:5.15.8 - mem_limit: 256m + mem_limit: 512m proxy: build: ./nginx-ingress image: local/nginx-ingress:acs + mem_limit: 256m ports: - 8080:8080 depends_on: From 979924957c87dae3695ee09f8e61664ef6c49f44 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 30 Jul 2021 15:53:20 -0400 Subject: [PATCH 08/12] updated ASS memory limit min --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 18022f7..8735bc2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,7 +48,7 @@ services: search: image: alfresco/alfresco-search-services:2.0.1 - mem_limit: 2g + mem_limit: 1g environment: - SOLR_ALFRESCO_HOST=platform - SOLR_ALFRESCO_PORT=8080 From 7511eba729a81b8f4156c507ebfc6b1aa880ada0 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:54:47 -0400 Subject: [PATCH 09/12] 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 c2a9679ede3cda961f4ab5517f4d2526b24ee391 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:05:39 -0400 Subject: [PATCH 10/12] update comment --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2668565..813001f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,3 @@ -# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml +# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # version: "3" From 57af0a20b170882b731cc7acc1a4f0457d261779 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:11:15 -0400 Subject: [PATCH 11/12] ACS v7.4.1.1 --- .env | 4 ++-- docker-compose.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 43cc336..654bc1b 100644 --- a/.env +++ b/.env @@ -5,6 +5,6 @@ PROXY_PROTOCOL=http PROXY_HOST=localhost PROXY_PORT=8080 -ACS_TAG=7.3.0 -AAMQ_TAG=5.17.1-jre17-centos7 +ACS_TAG=7.4.1.1 +AAMQ_TAG=latest POSTGRES_TAG=13 diff --git a/docker-compose.yml b/docker-compose.yml index 70d8b66..f88dd25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ version: "3" services: + platform: image: alfresco/alfresco-content-repository-community:${ACS_TAG} environment: From 81ca2ed0383f851ec06469fd21ede928e28a4d87 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:21:21 -0400 Subject: [PATCH 12/12] ACS search 2.0.8.2 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 08b10b5..a3d03a2 100644 --- a/.env +++ b/.env @@ -8,4 +8,4 @@ PROXY_PORT=8080 ACS_TAG=7.4.1.1 AAMQ_TAG=latest POSTGRES_TAG=13 -ASIE_TAG=2.0.5 +ASIE_TAG=2.0.8.2