From 723f3ec9547e9a53de0102b3f875a3e9cb674201 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:55:00 -0500 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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: "