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

.env

@@ -4,3 +4,8 @@ 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
+ACS_SHARE_TAG=7.4.1.2

alfresco-content-repository/docker/Dockerfile

@@ -1,4 +1,5 @@
-FROM alfresco/alfresco-content-repository-community:6.2.0-ga
+ARG ACS_TAG=inject-it
+FROM alfresco/alfresco-content-repository-community:${ACS_TAG}
 
 ARG USERNAME=alfresco
 ARG TOMCAT_DIR=/usr/local/tomcat
@@ -10,7 +11,7 @@ COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.
 COPY *.amp ${TOMCAT_DIR}/amps/
 
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules && \
+	mkdir -p ${TOMCAT_DIR}/modules/platform && \
 	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
 
 USER ${USERNAME}

alfresco-content-repository/docker/tomcat-platform-context.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Context>
         <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+                <PreResources base="${catalina.base}/modules/platform" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
         </Resources>
 </Context>
-

alfresco-share/docker/Dockerfile

@@ -1,4 +1,5 @@
-FROM alfresco/alfresco-share:6.2.2
+ARG ACS_SHARE_TAG=inject-it
+FROM alfresco/alfresco-share:${ACS_SHARE_TAG}
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
@@ -6,5 +7,5 @@ COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
 COPY *.amp ${TOMCAT_DIR}/amps_share/
 
 RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \
-	mkdir -p ${TOMCAT_DIR}/modules
+	mkdir -p ${TOMCAT_DIR}/modules/share
 

alfresco-share/docker/tomcat-share-context.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Context>
         <Resources>
-                <PreResources base="${catalina.base}/modules" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
+                <PreResources base="${catalina.base}/modules/share" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
         </Resources>
 </Context>
-

docker-compose.yml

@@ -1,60 +1,48 @@
-# 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
-        image: local/alfresco-content-repository:6.2.0-ga
-        mem_limit: 1700m
+        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.username=alfresco
-                -Ddb.password=alfresco
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dindex.subsystem.name=solr6
-                -Dsolr.host=search
-                -Dsolr.port=8983
-                -Dsolr.secureComms=none
                 -Dshare.host=${PROXY_HOST}
                 -Dshare.port=${PROXY_PORT}
                 -Dshare.protocol=${PROXY_PROTOCOL}
                 -Dalfresco.host=${PROXY_HOST}
                 -Dalfresco.port=${PROXY_PORT}
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
-                -Daos.baseUrlOverwrite=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos
                 -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-                -Ddeployment.method=DOCKER_COMPOSE
-                -DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-                -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/
-                -Djodconverter.url=http://transform-core-aio:8090/
-                -Dimg.url=http://transform-core-aio:8090/
-                -Dtika.url=http://transform-core-aio:8090/
-                -Dtransform.misc.url=http://transform-core-aio:8090/
-                -Dcsrf.filter.enabled=false
-                -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80
-
-                -Dtransform.service.enabled=false
-                
-                -Dsystem.content.eagerOrphanCleanup=true
-                -Dsystem.content.orphanProtectDays=0
-                -Djodconverter.enabled=false
                 "
         depends_on:
             - postgres-acs
             - activemq
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
-    
-    transform-core-aio:
-        image: alfresco/alfresco-transform-core-aio:2.3.6
+            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
     
     share:
-        build: ./alfresco-share/docker
-        image: local/alfresco-share:6.2.2
-        mem_limit: 512m
+        build:
+            context: ./alfresco-share/docker
+            args:
+                ACS_SHARE_TAG: ${ACS_SHARE_TAG}
+        image: local/alfresco-share:latest
         environment:
             REPO_HOST: "platform"
             CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*"
@@ -68,31 +56,13 @@ services:
                 -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
         volumes:
-            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
+            - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
     
     postgres-acs:
-        image: postgres:11.7
-        mem_limit: 512m
-        environment:
-            - POSTGRES_PASSWORD=alfresco
-            - POSTGRES_USER=alfresco
-            - POSTGRES_DB=alfresco
-        command: postgres -c max_connections=300 -c log_min_messages=LOG
-    
-    search:
-        image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
-        environment:
-            - SOLR_ALFRESCO_HOST=platform
-            - SOLR_ALFRESCO_PORT=8080
-            - SOLR_SOLR_HOST=search
-            - SOLR_SOLR_PORT=8983
-            - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-            - ALFRESCO_SECURE_COMMS=none
+        image: postgres:${POSTGRES_TAG}
 
     activemq:
-        image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        image: alfresco/alfresco-activemq:${AAMQ_TAG}
 
     proxy:
         build: ./nginx-ingress