From 29f254a68eb60e998f52e099cc148da2a3ba1123 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:19:58 -0400 Subject: [PATCH 01/13] updated to ACS v7.3.0 --- docker-compose.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 287ccbe..23440bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,17 @@ version: "2" services: platform: - image: alfresco/alfresco-content-repository:latest + image: alfresco/alfresco-content-repository-community:7.3.0 environment: + JAVA_TOOL_OPTIONS: " + -Dencryption.keystore.type=JCEKS + -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding + -Dencryption.keyAlgorithm=DESede + -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore + -Dmetadata-keystore.password=mp6yc0UD9e + -Dmetadata-keystore.aliases=metadata + -Dmetadata-keystore.metadata.password=oKIWzVdEdA + -Dmetadata-keystore.metadata.algorithm=DESede" JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco @@ -20,10 +29,10 @@ services: - activemq postgres-acs: - image: postgres:latest + image: postgres:13 activemq: - image: alfresco/alfresco-activemq:latest + image: alfresco/alfresco-activemq:5.17.1-jre17-centos7 proxy: build: ./nginx-ingress From 10e7f81163fcb9e0d780685267f31e4f9ebf9f07 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:46:58 -0400 Subject: [PATCH 02/13] advancing to docker v3 --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f70207f..2668565 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ # Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml # -# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose -version: "2" - +version: "3" From 8e3301877ad72135bd2d580c85a8f2f02fcc1308 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:51:11 -0400 Subject: [PATCH 03/13] parameterized docker image tags --- .env | 4 ++++ docker-compose.yml | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 171f8c4..43cc336 100644 --- a/.env +++ b/.env @@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license PROXY_PROTOCOL=http PROXY_HOST=localhost PROXY_PORT=8080 + +ACS_TAG=7.3.0 +AAMQ_TAG=5.17.1-jre17-centos7 +POSTGRES_TAG=13 diff --git a/docker-compose.yml b/docker-compose.yml index 9991a22..1e6053e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ version: "3" services: platform: - image: alfresco/alfresco-content-repository-community:7.3.0 + image: alfresco/alfresco-content-repository-community:${ACS_TAG} environment: JAVA_TOOL_OPTIONS: " -Dencryption.keystore.type=JCEKS @@ -28,10 +28,10 @@ services: - activemq postgres-acs: - image: postgres:13 + image: postgres:${POSTGRES_TAG} activemq: - image: alfresco/alfresco-activemq:5.17.1-jre17-centos7 + image: alfresco/alfresco-activemq:${AAMQ_TAG} proxy: build: ./nginx-ingress From 7511eba729a81b8f4156c507ebfc6b1aa880ada0 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 14:54:47 -0400 Subject: [PATCH 04/13] 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 fcd12627211127f7417027f20437eae6b0d79d30 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 15:03:04 -0400 Subject: [PATCH 05/13] parameterized ACS share version --- .env | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 43cc336..16ae058 100644 --- a/.env +++ b/.env @@ -8,3 +8,4 @@ PROXY_PORT=8080 ACS_TAG=7.3.0 AAMQ_TAG=5.17.1-jre17-centos7 POSTGRES_TAG=13 +ACS_SHARE_TAG=7.3.0 diff --git a/docker-compose.yml b/docker-compose.yml index 9e06735..639298f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - activemq share: - image: alfresco/alfresco-share:latest + image: alfresco/alfresco-share:${ACS_SHARE_TAG} environment: REPO_HOST: "platform" CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" From 9899d03da99d54520e3850be828663dc9d986949 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 15:07:51 -0400 Subject: [PATCH 06/13] parameterized ASIE version; enabled secret comms --- .env | 1 + docker-compose.yml | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 43cc336..8c2fb55 100644 --- a/.env +++ b/.env @@ -8,3 +8,4 @@ PROXY_PORT=8080 ACS_TAG=7.3.0 AAMQ_TAG=5.17.1-jre17-centos7 POSTGRES_TAG=13 +ASIE_TAG=2.0.5 diff --git a/docker-compose.yml b/docker-compose.yml index a66ac00..bc919a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,8 @@ services: JAVA_OPTS: " -Ddb.driver=org.postgresql.Driver -Dsolr.host=search + -Dsolr.secureComms=secret + -Dsolr.sharedSecret=alfresco-secret -Dalfresco.host=${PROXY_HOST} -Dalfresco.port=${PROXY_PORT} -Dalfresco.protocol=${PROXY_PROTOCOL} @@ -31,10 +33,14 @@ services: image: postgres:${POSTGRES_TAG} search: - image: alfresco/alfresco-search-services:latest + image: alfresco/alfresco-search-services:${ASIE_TAG} environment: - - SOLR_ALFRESCO_HOST=platform - - SOLR_SOLR_HOST=search + SOLR_ALFRESCO_HOST: platform + SOLR_SOLR_HOST: search + ALFRESCO_SECURE_COMMS: secret + JAVA_TOOL_OPTIONS: " + -Dalfresco.secureComms.secret=alfresco-secret + " activemq: image: alfresco/alfresco-activemq:${AAMQ_TAG} From 2dc64b23e44c43205064bd79a991b8de763744ed Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Tue, 1 Nov 2022 16:09:56 -0400 Subject: [PATCH 07/13] parameterized LATS version --- .env | 1 + docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 43cc336..035c066 100644 --- a/.env +++ b/.env @@ -6,5 +6,6 @@ PROXY_HOST=localhost PROXY_PORT=8080 ACS_TAG=7.3.0 +ATE_AIO_TAG=3.0.0 AAMQ_TAG=5.17.1-jre17-centos7 POSTGRES_TAG=13 diff --git a/docker-compose.yml b/docker-compose.yml index 6a48dee..4ebf17b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: - activemq transform-core-aio: - image: alfresco/alfresco-transform-core-aio:latest + image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG} postgres-acs: image: postgres:${POSTGRES_TAG} From c2a9679ede3cda961f4ab5517f4d2526b24ee391 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 18:05:39 -0400 Subject: [PATCH 08/13] 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 09/13] 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 23b3057329787f23395410242e07cf49b33076f7 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:19:43 -0400 Subject: [PATCH 10/13] ACS share v7.4.1.2 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 98a80a5..d0ffea4 100644 --- a/.env +++ b/.env @@ -8,4 +8,4 @@ PROXY_PORT=8080 ACS_TAG=7.4.1.1 AAMQ_TAG=latest POSTGRES_TAG=13 -ACS_SHARE_TAG=7.3.0 +ACS_SHARE_TAG=7.4.1.2 From 81ca2ed0383f851ec06469fd21ede928e28a4d87 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:21:21 -0400 Subject: [PATCH 11/13] 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 From 415994f1f38bf2978ae89c35a72d7aba0361775b Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:23:36 -0400 Subject: [PATCH 12/13] ATE AIO v4.0.0 --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 314a044..ea728b4 100644 --- a/.env +++ b/.env @@ -6,6 +6,6 @@ PROXY_HOST=localhost PROXY_PORT=8080 ACS_TAG=7.4.1.1 -ATE_AIO_TAG=3.0.0 +ATE_AIO_TAG=4.0.0 AAMQ_TAG=latest POSTGRES_TAG=13 From 59c87eb302b9f1c9967914a783e4fce391f13a9b Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 25 Oct 2023 20:37:32 -0400 Subject: [PATCH 13/13] added solr health check --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f98aa61..d95c67d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,6 +63,8 @@ services: JAVA_TOOL_OPTIONS: " -Dalfresco.secureComms.secret=alfresco-secret " + healthcheck: + test: "curl -fsS http://localhost:8983/solr" activemq: image: alfresco/alfresco-activemq:${AAMQ_TAG}