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 1/4] 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 2/4] 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 3/4] 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 4/4] 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