diff --git a/docker-compose.yml b/docker-compose.yml index a95498f..c945dc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/nginx-ingress/entrypoint.sh b/nginx-ingress/entrypoint.sh index 5adaad5..a38acac 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%"$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 diff --git a/nginx-ingress/nginx.conf b/nginx-ingress/nginx.conf index 0bbab22..0fd8d86 100644 --- a/nginx-ingress/nginx.conf +++ b/nginx-ingress/nginx.conf @@ -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; + } } }