From 29f254a68eb60e998f52e099cc148da2a3ba1123 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 14:19:58 -0400
Subject: [PATCH 01/12] 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" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 14:46:58 -0400
Subject: [PATCH 02/12] 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" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 14:51:11 -0400
Subject: [PATCH 03/12] 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" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 14:54:47 -0400
Subject: [PATCH 04/12] 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 b3a9145dd6a9fbf235bffb071a23187d9360a624 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 15:00:53 -0400
Subject: [PATCH 05/12] parameterized sync service version

---
 .env               | 1 +
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 43cc336..c17e466 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
+ALF_SYNC_SERV_TAG=3.7
diff --git a/docker-compose.yml b/docker-compose.yml
index c2be995..8f1a73e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     sync:
-        image: quay.io/alfresco/service-sync:latest
+        image: quay.io/alfresco/service-sync:${ALF_SYNC_SERV_TAG}
         environment:
             JAVA_OPTS : "
                 -Dsql.db.url=jdbc:postgresql://postgres-acs:5432/alfresco

From fcd12627211127f7417027f20437eae6b0d79d30 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 15:03:04 -0400
Subject: [PATCH 06/12] 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" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 15:07:51 -0400
Subject: [PATCH 07/12] 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 f569d712e1b1ddf730f768c9f57e38ea74f49108 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 15:30:07 -0400
Subject: [PATCH 08/12] parameterize Docker image versions

---
 .env               | 5 +++++
 docker-compose.yml | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index e69de29..d126a74 100644
--- a/.env
+++ b/.env
@@ -0,0 +1,5 @@
+
+ATR_TAG=2.0.0
+ATE_AIO_TAG=3.0.0
+ASFS_TAG=2.0.0
+AAMQ_TAG=5.17.1-jre17-centos7
diff --git a/docker-compose.yml b/docker-compose.yml
index a52d483..b3f8e48 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ version: "3"
 
 services:
     transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:latest
+        image: quay.io/alfresco/alfresco-transform-router:${ATR_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             CORE_AIO_URL : "http://transform-core-aio:8090"
@@ -14,7 +14,7 @@ services:
             - shared-file-store
     
     transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:latest
+        image: alfresco/alfresco-transform-core-aio:${ATE_AIO_TAG}
         environment:
             ACTIVEMQ_URL: "nio://activemq:61616"
             FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
@@ -23,12 +23,12 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:latest
+        image: alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
 volumes:
     shared-file-store-volume:

From 7113aa012f3053ffeaecfa4d2c3cbed3ab4aed68 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 15:36:33 -0400
Subject: [PATCH 09/12] parameterized the ADW version

---
 .env               | 1 +
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env b/.env
index 43cc336..216c798 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
+ADW_TAG=3.1.0
diff --git a/docker-compose.yml b/docker-compose.yml
index ec9aaf5..4d18b32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
         image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     digital-workspace:
-        image: quay.io/alfresco/alfresco-digital-workspace:latest
+        image: quay.io/alfresco/alfresco-digital-workspace:${ADW_TAG}
         environment:
             APP_CONFIG_ECM_HOST: "${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}"
     

From 2dc64b23e44c43205064bd79a991b8de763744ed Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 16:09:56 -0400
Subject: [PATCH 10/12] 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 fbbed5946fdc4af697b419d48112b0a7f370a925 Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 16:51:30 -0400
Subject: [PATCH 11/12] fixed ASFS docker image path

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b3f8e48..a7ae50e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ services:
             - shared-file-store
 
     shared-file-store:
-        image: alfresco/alfresco-shared-file-store:${ASFS_TAG}
+        image: quay.io/alfresco/alfresco-shared-file-store:${ASFS_TAG}
         volumes:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     

From 452ff6975d83ad60ce6d977bc93c2118d6e06dee Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 1 Nov 2022 17:38:25 -0400
Subject: [PATCH 12/12] parameterized ACS Share version

---
 .env               | 1 +
 docker-compose.yml | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 9eec367..21a6452 100644
--- a/.env
+++ b/.env
@@ -12,4 +12,5 @@ ASFS_TAG=2.0.0
 AAMQ_TAG=5.17.1-jre17-centos7
 POSTGRES_TAG=13
 ASIE_TAG=2.0.5
+ACS_SHARE_TAG=7.3.0
 ALF_SYNC_SERV_TAG=3.7
diff --git a/docker-compose.yml b/docker-compose.yml
index 3eab6a3..0e65e8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,8 +83,7 @@ services:
             - shared-file-store-volume:/tmp/Alfresco/sfs
     
     share:
-        image: quay.io/alfresco/alfresco-governance-share-enterprise:V3.4-latest
-        mem_limit: 512m
+        image: quay.io/alfresco/alfresco-governance-share-enterprise:${ACS_TAG}
         environment:
             REPO_HOST: "platform"
             CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"