From 00ba4c367f3671d4fb64e11017e0f0775b6e6cef Mon Sep 17 00:00:00 2001
From: "Douglas C. R. Paes" <dpaes@dgcloud.com.br>
Date: Thu, 12 Jan 2023 17:02:50 -0300
Subject: [PATCH 1/2] Fix to have ASS working

The volume declaration is duplicated;
The memory limit configuration format is not supported by compose 3.4.
---
 .../resources/archetype-resources/docker/docker-compose.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index fc564446..21f4942a 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -53,11 +53,13 @@ services:
     ports:
       - "8983:8983"
     volumes:
-      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
   ${rootArtifactId}-activemq:
       image: alfresco/alfresco-activemq:5.16.1
-      mem_limit: 1g
+      deploy:
+        resources:
+          limits:
+            memory: 1g
       ports:
         - 8161:8161 # Web Console
         - 5672:5672 # AMQP

From b105a388083a7673d2becd0a2b33f11a0466afd2 Mon Sep 17 00:00:00 2001
From: "Douglas C. R. Paes" <dpaes@dgcloud.com.br>
Date: Fri, 13 Jan 2023 11:31:10 -0300
Subject: [PATCH 2/2] Fix the generated docker-compose.yml file

If the file is let as it is, when the file is processed, maven introduces values that are invalid for the commented block, like:

-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=AES
-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=AES
---
 .../main/resources/archetype-resources/docker/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index 441d1fd5..1e70735d 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -33,7 +33,6 @@ services:
 #                -Dtransform.service.enabled=false
 #                -Dlocal.transform.service.enabled=false
 #                -Dlegacy.transform.service.enabled=false
-#                ${symbol_dollar}{keystore.settings}
 #                "
 #    ports:
 #      - "${symbol_dollar}{acs.port}:8080"