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

This commit is contained in:
Brian Long 2021-07-30 16:40:01 -04:00
commit cbbf9c8c9a
3 changed files with 3 additions and 4 deletions

View File

@ -6,5 +6,5 @@ COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml
COPY *.amp ${TOMCAT_DIR}/amps_share/ 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 && \ 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

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<Context> <Context>
<Resources> <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> </Resources>
</Context> </Context>

View File

@ -41,7 +41,7 @@ services:
-Dalfresco.protocol=${PROXY_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
" "
volumes: volumes:
- "./alfresco-share/modules:/usr/local/tomcat/modules:ro" - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro"
postgres-acs: postgres-acs:
image: postgres:latest image: postgres:latest