From c1323a81713f1e29feceddaaf126da00f33c32db Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:38:34 -0500 Subject: [PATCH 1/9] added ATS minimum unconfigured services --- docker-compose.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc160fe..5727f8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,15 @@ services: alfresco: image: alfresco/alfresco-content-repository:latest + transform-router: + image: quay.io/alfresco/alfresco-transform-router:latest + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + + shared-file-store: + image: alfresco/alfresco-shared-file-store:latest + postgres-acs: image: postgres:latest @@ -19,3 +28,9 @@ services: - alfresco ports: - 8080:8080 + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs From dcb88c42eaad73d2cd1667d17caa6831fb987ec1 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 16 Dec 2020 23:44:46 -0500 Subject: [PATCH 2/9] 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 79ef1f5868e01c462406ff190064939761dfa1a9 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:37:10 -0500 Subject: [PATCH 3/9] added depends_on for ATS --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ae8eace..7a4d3a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,19 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store transform-router: image: quay.io/alfresco/alfresco-transform-router:latest + depends_on: + - activemq + - shared-file-store transform-core-aio: image: alfresco/alfresco-transform-core-aio:latest + depends_on: + - activemq + - shared-file-store shared-file-store: image: alfresco/alfresco-shared-file-store:latest From 487a677f6fe8c2e565ae7f53fa3c30053e883bde Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 12:48:48 -0500 Subject: [PATCH 4/9] added service referencing variables --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 083b8a7..6a0b4b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,12 +18,19 @@ services: transform-router: image: quay.io/alfresco/alfresco-transform-router:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" depends_on: - activemq - shared-file-store transform-core-aio: image: alfresco/alfresco-transform-core-aio:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" depends_on: - activemq - shared-file-store From 63d1ee7ef99cc1a37e4033b6df13a968342d0ea5 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 13:03:32 -0500 Subject: [PATCH 5/9] 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 f73fdbb5ea26037466f3bad12c1852317701a509 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 17:16:01 -0500 Subject: [PATCH 6/9] added volume to base shared file store config --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 7c218a5..acc03c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,6 +37,8 @@ services: shared-file-store: image: alfresco/alfresco-shared-file-store:latest + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs postgres-acs: image: postgres:latest From 1d0aa0c91e1144f9d3074f633a32bfadd179a25e Mon Sep 17 00:00:00 2001 From: Brian Long Date: Thu, 17 Dec 2020 21:00:27 -0500 Subject: [PATCH 7/9] 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 ce9b143fb58e84c3a73fc321f0da7061ece648d8 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 21 Dec 2020 11:50:38 -0500 Subject: [PATCH 8/9] added ATS-only base config --- docker-compose.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f70207f..532c9ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,3 +3,36 @@ # Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose version: "2" +services: + transform-router: + image: quay.io/alfresco/alfresco-transform-router:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + CORE_AIO_URL : "http://transform-core-aio:8090" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:latest + environment: + ACTIVEMQ_URL: "nio://activemq:61616" + FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" + depends_on: + - activemq + - shared-file-store + + shared-file-store: + image: alfresco/alfresco-shared-file-store:latest + volumes: + - shared-file-store-volume:/tmp/Alfresco/sfs + + activemq: + image: alfresco/alfresco-activemq:latest + +volumes: + shared-file-store-volume: + driver_opts: + type: tmpfs + device: tmpfs From 68dc0713428ae8b4e7a79bd6c021f516bae54b49 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Wed, 6 Jan 2021 15:36:32 -0500 Subject: [PATCH 9/9] configured ACS for ATS --- docker-compose.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 81ac2c7..76d895d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,8 +23,16 @@ services: -Dcsrf.filter.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 - -Dtransform.service.enabled=false + -Dtransform.service.enabled=true -Dlocal.transform.service.enabled=false + + -Dtransform.service.url=http://transform-router:8095 + -Dsfs.url=http://shared-file-store:8099 + -Dalfresco-pdf-renderer.url=http://transform-engine-aio:8090 + -Djodconverter.url=http://transform-engine-aio:8090 + -Dimg.url=http://transform-engine-aio:8090 + -Dtika.url=http://transform-engine-aio:8090 + -Dtransform.misc.url=http://transform-engine-aio:8090 -Dsystem.content.eagerOrphanCleanup=true -Dsystem.content.orphanProtectDays=0 @@ -33,9 +41,10 @@ services: depends_on: - postgres-acs - activemq + - shared-file-store transform-router: - image: quay.io/alfresco/alfresco-transform-router:latest + image: quay.io/alfresco/alfresco-transform-router:1.3.1 environment: ACTIVEMQ_URL: "nio://activemq:61616" CORE_AIO_URL : "http://transform-core-aio:8090" @@ -45,7 +54,7 @@ services: - shared-file-store transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:2.3.6 environment: ACTIVEMQ_URL: "nio://activemq:61616" FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file" @@ -54,7 +63,7 @@ services: - shared-file-store shared-file-store: - image: alfresco/alfresco-shared-file-store:latest + image: alfresco/alfresco-shared-file-store:0.10.0 volumes: - shared-file-store-volume:/tmp/Alfresco/sfs