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

This commit is contained in:
Brian Long 2020-12-26 14:27:23 -05:00
commit 58e4543d0f
2 changed files with 18 additions and 2 deletions

8
.env
View File

@ -1,3 +1,7 @@
BASEDIR=~ EXTERNAL_RESOURCE_DIR=~
ALFRESCO_DIR=${BASEDIR}/alfresco ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
PROXY_PROTOCOL=http
PROXY_HOST=localhost
PROXY_PORT=8080

View File

@ -9,7 +9,14 @@ services:
image: local/alfresco-content-repository:latest image: local/alfresco-content-repository:latest
environment: environment:
JAVA_OPTS: " JAVA_OPTS: "
-Ddb.driver=org.postgresql.Driver
-Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-Dshare.host=${PROXY_HOST}
-Dshare.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
" "
depends_on: depends_on:
@ -23,6 +30,11 @@ services:
image: local/alfresco-share:latest image: local/alfresco-share:latest
environment: environment:
REPO_HOST: "platform" REPO_HOST: "platform"
JAVA_OPTS: "
-Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
"
volumes: volumes:
- "./alfresco-share/modules:/usr/local/tomcat/modules:ro" - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"