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

added adw to nginx

parent 5cd3530e

docker-compose.yml

+1 −1
Changes for docker-compose.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ services: 
    

    proxy:

        build: ./nginx-ingress

        image: local/nginx-ingress:acs

        image: local/nginx-ingress:acs-adw

        ports:

            - 8080:8080

        depends_on:

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
@@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then 
  sed -i s%http:\/\/platform:8080%"$REPO_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
@@ -47,5 +47,12 @@ http { 
            # If using external proxy / load balancer (for initial redirect if no trailing slash)

            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;

        }

    }

}