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

alfresco-content-repository/docker/Dockerfile

@@ -5,8 +5,12 @@ ARG TOMCAT_DIR=/usr/local/tomcat
 
 USER root
 
-COPY *.amp ${TOMCAT_DIR}/amps
+COPY catalina.policy /tmp/catalina.policy.ext
+COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml
+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
+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 && \
+	cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
 
 USER ${USERNAME}

alfresco-content-repository/docker/catalina.policy

@@ -0,0 +1,4 @@
+grant codeBase "file:${catalina.base}/modules/-" {
+    permission java.security.AllPermission;
+};
+

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

@@ -0,0 +1,7 @@
+<?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" />
+        </Resources>
+</Context>
+

alfresco-share/docker/Dockerfile

@@ -2,6 +2,9 @@ FROM alfresco/alfresco-share:6.2.2
 
 ARG TOMCAT_DIR=/usr/local/tomcat
 
-COPY *.amp ${TOMCAT_DIR}/amps_share
+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
 
-RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory

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

@@ -0,0 +1,7 @@
+<?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" />
+        </Resources>
+</Context>
+

docker-compose.yml

@@ -44,7 +44,7 @@ services:
             - postgres-acs
             - activemq
         volumes:
-            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
+            - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
     
     transform-core-aio:
         image: alfresco/alfresco-transform-core-aio:2.3.6
@@ -60,7 +60,7 @@ services:
                 -Dalfresco.port=8080
                 "
         volumes:
-            - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
+            - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"
     
     postgres-acs:
         image: postgres:11.7