diff --git a/.env b/.env index 3057e30..af14c9d 100644 --- a/.env +++ b/.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 diff --git a/docker-compose.yml b/docker-compose.yml index d0b9dc0..e667690 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,12 +14,9 @@ services: -Ddb.password=alfresco -Ddb.url=jdbc:postgresql://postgres-acs:5432/alfresco -Dindex.subsystem.name=noindex - -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} -Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE