diff --git a/docker-compose.yml b/docker-compose.yml index fb59443..748483a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -142,15 +142,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 - sync - share + - digital-workspace volumes: shared-file-store-volume: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 1a1609d..44b41d8 100644 --- a/nginx-ingress/entrypoint.sh +++ b/nginx-ingress/entrypoint.sh @@ -4,12 +4,16 @@ if [[ $ACS_PLATFORM_URL ]]; then sed -i s%http:\/\/platform:8080%"$ACS_PLATFORM_URL"%g /etc/nginx/nginx.conf fi +if [[ $ACS_SYNC_URL ]]; then + sed -i s%http:\/\/sync:9090%"$ACS_SYNC_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 [[ $ACS_SYNC_URL ]]; then - sed -i s%http:\/\/sync:9090%"$ACS_SYNC_URL"%g /etc/nginx/nginx.conf +if [[ $ADW_URL ]]; then + sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf fi if [[ $ACCESS_LOG ]]; then diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index d79f3e0..4ea2d98 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -48,6 +48,10 @@ http { # If using external proxy / load balancer (for initial redirect if no trailing slash) absolute_redirect off; } + + location /sync/ { + proxy_pass http://sync:9090/alfresco/; + } location /share/ { proxy_pass http://share:8080; @@ -56,8 +60,11 @@ http { absolute_redirect off; } - location /sync/ { - proxy_pass http://sync:9090/alfresco/; + location /workspace/ { + proxy_pass http://digital-workspace:8080; + + # If using external proxy / load balancer (for initial redirect if no trailing slash) + absolute_redirect off; } } }