Merge branch 'acs-lats-community.acs-community' into acs-backend-community.acs-lats-community

2020-12-26 14:20:12 -05:00 · 2020-12-26 14:20:12 -05:00 · 86ad2bc409
commit 86ad2bc409
parent 17f70ea253 2a56247aa1
2 changed files with 9 additions and 4 deletions
--- a/.env
+++ b/.env
@ -1,3 +1,7 @@
-BASEDIR=~
-ALFRESCO_DIR=${BASEDIR}/alfresco
+EXTERNAL_RESOURCE_DIR=~
+ALFRESCO_DIR=${EXTERNAL_RESOURCE_DIR}/alfresco
 ALFRESCO_LICENSE_DIR=${ALFRESCO_DIR}/license
+
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -17,8 +17,9 @@ services:
                -Dsolr.host=search
                -Dsolr.port=8983
                -Dsolr.secureComms=none
-                -Dalfresco.host=localhost
-                -Dalfresco.port=8080
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
                -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
                -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\"
                -Ddeployment.method=DOCKER_COMPOSE