Merge branch 'acs-community.acs-base' into acs-search-community.acs-community

This commit is contained in:
Brian Long 2020-12-26 14:02:30 -05:00
commit fc9c26eac5
2 changed files with 6 additions and 12 deletions

9
.env
View File

@ -2,9 +2,6 @@ EXTERNAL_RESOURCE_DIR=~
ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
PROXY_PLATFORM_PROTOCOL=http PROXY_PROTOCOL=http
PROXY_PLATFORM_HOST=localhost PROXY_HOST=localhost
PROXY_PLATFORM_PORT=8080 PROXY_PORT=8080
PROXY_SHARE_PROTOCOL=http
PROXY_SHARE_HOST=localhost
PROXY_SHARE_PORT=8080

View File

@ -17,12 +17,9 @@ services:
-Dsolr.host=search -Dsolr.host=search
-Dsolr.port=8983 -Dsolr.port=8983
-Dsolr.secureComms=none -Dsolr.secureComms=none
-Dshare.host=${PROXY_SHARE_HOST} -Dalfresco.host=${PROXY_HOST}
-Dshare.port=${PROXY_SHARE_PORT} -Dalfresco.port=${PROXY_PORT}
-Dshare.protocol=${PROXY_SHARE_PROTOCOL} -Dalfresco.protocol=${PROXY_PROTOCOL}
-Dalfresco.host=${PROXY_PLATFORM_HOST}
-Dalfresco.port=${PROXY_PLATFORM_PORT}
-Dalfresco.protocol=${PROXY_PLATFORM_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