Merge branch 'ext-jsconsole' into acs-jsconsole
This commit is contained in:
commit
3957262e74
@ -10,7 +10,7 @@ COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.
|
|||||||
COPY *.amp ${TOMCAT_DIR}/amps/
|
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 && \
|
mkdir -p ${TOMCAT_DIR}/modules/platform && \
|
||||||
cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
|
cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy
|
||||||
|
|
||||||
USER ${USERNAME}
|
USER ${USERNAME}
|
||||||
|
@ -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/platform" className="org.apache.catalina.webresources.DirResourceSet" webAppMount="/WEB-INF/lib" readOnly="true" />
|
||||||
</Resources>
|
</Resources>
|
||||||
</Context>
|
</Context>
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ services:
|
|||||||
- postgres-acs
|
- postgres-acs
|
||||||
- activemq
|
- activemq
|
||||||
volumes:
|
volumes:
|
||||||
- "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro"
|
- "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro"
|
||||||
|
|
||||||
transform-core-aio:
|
transform-core-aio:
|
||||||
image: alfresco/alfresco-transform-core-aio:2.3.6
|
image: alfresco/alfresco-transform-core-aio:2.3.6
|
||||||
@ -69,7 +69,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:11.7
|
image: postgres:11.7
|
||||||
|
Loading…
x
Reference in New Issue
Block a user