Merge branch 'ext-jsconsole' into acs-jsconsole

alfresco-content-repository/docker/Dockerfile

@@ -10,7 +10,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

@@ -6,5 +6,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

@@ -46,10 +46,11 @@ services:
             - postgres-acs
             - activemq
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
+            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
+        mem_limit: 1g
     
     share:
         build: ./alfresco-share/docker
@@ -68,11 +69,11 @@ 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
+        mem_limit: 128m
         environment:
             - POSTGRES_PASSWORD=alfresco
             - POSTGRES_USER=alfresco
@@ -81,7 +82,7 @@ services:
     
     search:
         image: alfresco/alfresco-search-services:2.0.1
-        mem_limit: 2g
+        mem_limit: 1g
         environment:
             - SOLR_ALFRESCO_HOST=platform
             - SOLR_ALFRESCO_PORT=8080
@@ -92,11 +93,12 @@ services:
 
     activemq:
         image: alfresco/alfresco-activemq:5.15.8
-        mem_limit: 256m
+        mem_limit: 512m
 
     proxy:
         build: ./nginx-ingress
         image: local/nginx-ingress:acs-share
+        mem_limit: 256m
         ports:
             - 8080:8080
         depends_on: