From 0e58ef1dc96efe0759902bdcb5b83f5effb22017 Mon Sep 17 00:00:00 2001 From: Andrei Zapodeanu Date: Mon, 26 Nov 2018 17:23:15 +0200 Subject: [PATCH] REPO-3943: Service Pack: MNT-20042: Official Alfresco Docker Image Missing vti-bin war file (#101) --- distribution/pom.xml | 7 +++++++ docker-alfresco/Dockerfile | 4 ++++ docker-alfresco/pom.xml | 9 +++++++++ 3 files changed, 20 insertions(+) diff --git a/distribution/pom.xml b/distribution/pom.xml index 7013173009..2dc05e82b8 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -138,6 +138,13 @@ ${project.build.outputDirectory}/web-server/webapps ROOT.war + + org.alfresco.aos-module + alfresco-vti-bin + war + ${project.build.outputDirectory}/web-server/webapps + wti-bin.war + diff --git a/docker-alfresco/Dockerfile b/docker-alfresco/Dockerfile index 8e0cb6f5e4..ae7db419b4 100644 --- a/docker-alfresco/Dockerfile +++ b/docker-alfresco/Dockerfile @@ -60,6 +60,7 @@ COPY target/connector/* /usr/local/tomcat/lib/ COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/ RUN rm -rf /usr/local/tomcat/webapps/ROOT COPY target/server-root/* /usr/local/tomcat/webapps +COPY target/wti-bin/* /usr/local/tomcat/webapps # Change the value of the shared.loader= property to the following: # shared.loader=${catalina.base}/shared/classes @@ -103,6 +104,9 @@ RUN mkdir /usr/local/tomcat/webapps/ROOT && cd /usr/local/tomcat/webapps/ROOT && # Grant only deployXmlPermission to ROOT webapp. sed -i -e "\$a\grant\ codeBase\ \"file:\$\{catalina.base\}\/webapps\/alfresco\/-\" \{\n\ permission\ java.security.AllPermission\;\n\};\ngrant\ codeBase\ \"file:\$\{catalina.base\}\/webapps\/ROOT\/-\" \{\n\ permission org.apache.catalina.security.DeployXmlPermission \"ROOT\";\n\};" /usr/local/tomcat/conf/catalina.policy +# Unpack wti-bin.war +RUN mkdir /usr/local/tomcat/webapps/wti-bin && cd /usr/local/tomcat/webapps/wti-bin && jar -xvf /usr/local/tomcat/webapps/wti-bin.war && rm -f /usr/local/tomcat/webapps/wti-bin.war + # To remote debug into this image add: EXPOSE 8000 # Changes are also required to the docker-compose/docker-compose.yml file. # EXPOSE 8000 diff --git a/docker-alfresco/pom.xml b/docker-alfresco/pom.xml index f53f244606..4940bda9b9 100644 --- a/docker-alfresco/pom.xml +++ b/docker-alfresco/pom.xml @@ -139,6 +139,15 @@ ${project.build.directory}/server-root ROOT.war + + org.alfresco.aos-module + alfresco-vti-bin + ${alfresco.aos-module.version} + war + false + ${project.build.directory}/wti-bin + wti-bin.war +