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

.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

docker-compose.yml

@@ -17,10 +17,12 @@ services:
                 -Dsolr.host=search
                 -Dsolr.port=8983
                 -Dsolr.secureComms=none
-                -Dshare.host=localhost
-                -Dshare.port=8080
-                -Dalfresco.host=localhost
-                -Dalfresco.port=8080
+                -Dshare.host=${PROXY_HOST}
+                -Dshare.port=${PROXY_PORT}
+                -Dshare.protocol=${PROXY_PROTOCOL}
+                -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
@@ -52,8 +54,9 @@ services:
         environment:
             REPO_HOST: "platform"
             JAVA_OPTS: "
-                -Dalfresco.host=localhost
-                -Dalfresco.port=8080
+                -Dalfresco.host=${PROXY_HOST}
+                -Dalfresco.port=${PROXY_PORT}
+                -Dalfresco.protocol=${PROXY_PROTOCOL}
                 "
     
     postgres-acs: