Commit cc4ed621 authored by Brian Long's avatar Brian Long
Browse files

Merge remote-tracking branch 'origin/acs-adw-base' into ags-frontend-enterprise

parents e8a8d088 0a0cb155

docker-compose.yml

+5 −1
Changes for docker-compose.yml: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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:

nginx-ingress/entrypoint.sh

+4 −0
Changes for nginx-ingress/entrypoint.sh: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

nginx-ingress/nginx.conf

+7 −0
Changes for nginx-ingress/nginx.conf: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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/;

        }