Merge branch 'acs-ext-platform' into ext-jsconsole

.env

@@ -4,3 +4,7 @@ ALFRESCO_LICENSE_DIR=~/alfresco/license
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
+
+ACS_TAG=7.4.1.1
+AAMQ_TAG=latest
+POSTGRES_TAG=13

alfresco-content-repository/docker/Dockerfile

@@ -1,4 +1,5 @@
-FROM alfresco/alfresco-content-repository:latest
+ARG ACS_TAG=inject-it
+FROM alfresco/alfresco-content-repository-community:${ACS_TAG}
 
 ARG USERNAME=alfresco
 ARG TOMCAT_DIR=/usr/local/tomcat

docker-compose.yml

@@ -1,13 +1,25 @@
-# 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
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
-version: "2"
+version: "3"
 
 services:
+
     platform:
-        build: ./alfresco-content-repository/docker
+        build:
+            context: ./alfresco-content-repository/docker
+            args:
+                ACS_TAG: ${ACS_TAG}
         image: local/alfresco-content-repository:latest
         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
@@ -44,10 +56,10 @@ services:
             - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
     
     postgres-acs:
-        image: postgres:latest
+        image: postgres:${POSTGRES_TAG}
 
     activemq:
-        image: alfresco/alfresco-activemq:latest
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress