From dcb88c42eaad73d2cd1667d17caa6831fb987ec1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:44:46 -0500 Subject: [PATCH 1/7] 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 3fea801d26efde51628b2d536bcfc5e8fc8ebe22 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 00:01:13 -0500 Subject: [PATCH 2/7] 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 3/7] 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 4/7] 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 ddb535ab14a9688ab0216545a8685842257f2f79 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 16:40:02 -0500 Subject: [PATCH 5/7] 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 6/7] 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 1d0aa0c91e1144f9d3074f633a32bfadd179a25e Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 21:00:27 -0500 Subject: [PATCH 7/7] 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