diff --git a/docker-compose.yml b/docker-compose.yml index 13583b8..e7b5172 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,12 +17,21 @@ services: -Dsolr.host=search -Dsolr.port=8983 -Dsolr.secureComms=none + -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=${PROXY_PROTOCOL}://${PROXY_HOST}:${PROXY_PORT}/alfresco/aos -Dmessaging.broker.url=\"failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true\" -Ddeployment.method=DOCKER_COMPOSE + -DlocalTransform.core-aio.url=http://transform-core-aio:8090/ + -Dalfresco-pdf-renderer.url=http://transform-core-aio:8090/ + -Djodconverter.url=http://transform-core-aio:8090/ + -Dimg.url=http://transform-core-aio:8090/ + -Dtika.url=http://transform-core-aio:8090/ + -Dtransform.misc.url=http://transform-core-aio:8090/ -Dcsrf.filter.enabled=false -XX:MinRAMPercentage=50 -XX:MaxRAMPercentage=80 @@ -72,6 +81,25 @@ services: volumes: - shared-file-store-volume:/tmp/Alfresco/sfs + transform-core-aio: + image: alfresco/alfresco-transform-core-aio:2.3.6 + + share: + image: alfresco/alfresco-share:6.2.2 + mem_limit: 512m + environment: + REPO_HOST: "platform" + CSRF_FILTER_REFERER: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?/?.*" + CSRF_FILTER_ORIGIN: "${PROXY_PROTOCOL}://${PROXY_HOST}(:${PROXY_PORT})?" + JAVA_OPTS: " + -Dshare.host=${PROXY_HOST} + -Dshare.port=${PROXY_PORT} + -Dshare.protocol=${PROXY_PROTOCOL} + -Dalfresco.host=${PROXY_HOST} + -Dalfresco.port=${PROXY_PORT} + -Dalfresco.protocol=${PROXY_PROTOCOL} + " + postgres-acs: image: postgres:11.7 mem_limit: 512m @@ -98,11 +126,12 @@ services: proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs + image: local/nginx-ingress:acs-share ports: - 8080:8080 depends_on: - platform + - share volumes: shared-file-store-volume: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 3dc2e8e..48f44e8 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf fi +if [[ $ACS_SHARE_URL ]]; then + sed -i s%http:\/\/share:8080%"$ACS_SHARE_URL"%g /etc/nginx/nginx.conf +fi + if [[ $ACCESS_LOG ]]; then sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf fi diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 01564f8..f9b11d0 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -48,5 +48,12 @@ http { # If using external proxy / load balancer (for initial redirect if no trailing slash) absolute_redirect off; } + + location /share/ { + proxy_pass http://share:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; + } } }