Merge branch 'acs-share-base.acs-base' into acs-frontend-community.acs-share-base

This commit is contained in:
Brian Long 2020-12-26 14:22:18 -05:00
commit d4f4b6217e
2 changed files with 15 additions and 8 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

@ -17,10 +17,12 @@ services:
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.port=8983
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dshare.host=localhost -Dshare.host=${PROXY_HOST}
-Dshare.port=8080 -Dshare.port=${PROXY_PORT}
-Dalfresco.host=localhost -Dshare.protocol=${PROXY_PROTOCOL}
-Dalfresco.port=8080 -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
-Ddeployment.method=DOCKER_COMPOSE -Ddeployment.method=DOCKER_COMPOSE
@ -52,8 +54,9 @@ services:
environment: environment:
REPO_HOST: "platform" REPO_HOST: "platform"
JAVA_OPTS: " JAVA_OPTS: "
-Dalfresco.host=localhost -Dalfresco.host=${PROXY_HOST}
-Dalfresco.port=8080 -Dalfresco.port=${PROXY_PORT}
-Dalfresco.protocol=${PROXY_PROTOCOL}
" "
postgres-acs: postgres-acs: