diff --git a/.env b/.env index fb511c7..af14c9d 100644 --- 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 diff --git a/docker-compose.yml b/docker-compose.yml index 37f6f65..1d3fc89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,10 +18,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 @@ -56,8 +58,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} " volumes: - "./alfresco-share/modules:/usr/local/tomcat/modules:ro"