added adw to nginx

This commit is contained in:
Brian Long 2020-12-17 16:28:54 -05:00
parent 5cd3530ef0
commit e5824d17e1
3 changed files with 12 additions and 1 deletions

View File

@ -26,7 +26,7 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:acs image: local/nginx-ingress:acs-adw
ports: ports:
- 8080:8080 - 8080:8080
depends_on: depends_on:

View File

@ -4,6 +4,10 @@ if [[ $ACS_PLATFORM_URL ]]; then
sed -i s%http:\/\/platform:8080%"$REPO_URL"%g /etc/nginx/nginx.conf sed -i s%http:\/\/platform:8080%"$REPO_URL"%g /etc/nginx/nginx.conf
fi fi
if [[ $ADW_URL ]]; then
sed -i s%http:\/\/digital-workspace:8080%"$ADW_URL"%g /etc/nginx/nginx.conf
fi
if [[ $ACCESS_LOG ]]; then if [[ $ACCESS_LOG ]]; then
sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
fi fi

View File

@ -47,5 +47,12 @@ http {
# If using external proxy / load balancer (for initial redirect if no trailing slash) # If using external proxy / load balancer (for initial redirect if no trailing slash)
absolute_redirect off; 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;
}
} }
} }