diff --git a/docker-compose.yml b/docker-compose.yml index f3f45b9..047388c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -138,15 +138,19 @@ services: - postgres-acs - activemq + digital-workspace: + image: quay.io/alfresco/alfresco-digital-workspace:latest + proxy: build: ./nginx-ingress - image: local/nginx-ingress:acs-sync-share + image: local/nginx-ingress:acs-sync-share-adw ports: - 8080:8080 depends_on: - platform - share - sync + - digital-workspace volumes: shared-file-store-volume: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 1a1609d..ff36900 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -12,6 +12,10 @@ if [[ $ACS_SYNC_URL ]]; then sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf fi +if [[ $ADW_URL ]]; then + sed -i s%http:\/\/digital-workspace:8080%"$ADW_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 d79f3e0..278251b 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -56,6 +56,13 @@ http { absolute_redirect off; } + location /workspace/ { + proxy_pass http://digital-workspace:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; + } + location /sync/ { proxy_pass http://sync:9090/alfresco/; }