From dcb88c42eaad73d2cd1667d17caa6831fb987ec1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:44:46 -0500 Subject: [PATCH 01/12] added minimum unconfigured search service --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..3db1984 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,9 @@ services: postgres-acs: image: postgres:latest + + solr6: + image: alfresco/alfresco-search-services:latest activemq: image: alfresco/alfresco-activemq:latest From 723f3ec9547e9a53de0102b3f875a3e9cb674201 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:55:00 -0500 Subject: [PATCH 02/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 3fea801d26efde51628b2d536bcfc5e8fc8ebe22 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 00:01:13 -0500 Subject: [PATCH 03/12] added minimum local transform service --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0214f19..40cdced 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,9 @@ services: - postgres-acs - activemq + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + postgres-acs: image: postgres:latest From 63d1ee7ef99cc1a37e4033b6df13a968342d0ea5 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:03:32 -0500 Subject: [PATCH 04/12] changed service from solr6 to search; added service name variables --- docker-compose.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1af162a..51c611c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: environment: JAVA_OPTS: " -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco + -Dsolr.host=search -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" " depends_on: @@ -18,8 +19,11 @@ services: postgres-acs: image: postgres:latest - solr6: + search: image: alfresco/alfresco-search-services:latest + environment: + - SOLR_ALFRESCO_HOST=platform + - SOLR_SOLR_HOST=search activemq: image: alfresco/alfresco-activemq:latest From 0bb3b7bb28c5b1aa03f33c59a64c350b003bee15 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:07:55 -0500 Subject: [PATCH 05/12] added service name reference to platform --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 4fb79a4..b904a49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ services: JAVA_OPTS: " -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ " depends_on: - postgres-acs From 90e935a49ee34c3acc9b920103001dd46dbfa36c Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:22:05 -0500 Subject: [PATCH 06/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 055119eeb5e5e8d005eeccf2cfab672a0a5a58bc Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 14:24:15 -0500 Subject: [PATCH 07/12] added share config --- docker-compose.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5f81426..0ba37ec 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 + -Dshare.host=localhost + -Dshare.port=8080 -Dalfresco.host=localhost -Dalfresco.port=8080 -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos @@ -34,9 +36,14 @@ services: - activemq share: - image: alfresco/alfresco-share:latest + image: alfresco/alfresco-share:6.2.2 + mem_limit: 512m environment: REPO_HOST: "platform" + JAVA_OPTS: " + -Dalfresco.host=localhost + -Dalfresco.port=8080 + " postgres-acs: image: postgres:11.7 From ddb535ab14a9688ab0216545a8685842257f2f79 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:40:02 -0500 Subject: [PATCH 08/12] added legacy transform URLs --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ed8dba9..97b2b3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,11 @@ services: -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -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/ " depends_on: - postgres-acs From 6a6dbdc79846ec24260f4209fbe2d8c23b823151 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:48:13 -0500 Subject: [PATCH 09/12] set core-aio version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index fefa67f..d45169b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - activemq transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:2.3.6 postgres-acs: image: postgres:11.7 From c22af67a06a884c5c80339d34f546512c691f6cb Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 18:53:34 -0500 Subject: [PATCH 10/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 11/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 12/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