Merge branch 'acs-base.proxy' into acs-persist.acs-base

.env

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

docker-compose.yml

@@ -10,12 +10,9 @@ services:
             JAVA_OPTS: "
                 -Ddb.driver=org.postgresql.Driver
                 -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco
-                -Dshare.host=${PROXY_SHARE_HOST}
-                -Dshare.port=${PROXY_SHARE_PORT}
-                -Dshare.protocol=${PROXY_SHARE_PROTOCOL}
-                -Dalfresco.host=${PROXY_PLATFORM_HOST}
-                -Dalfresco.port=${PROXY_PLATFORM_PORT}
-                -Dalfresco.protocol=${PROXY_PLATFORM_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\"
                 "
         depends_on: