Merge branch 'proxy.base' into acs-proxy.proxy

This commit is contained in:
Brian Long 2020-12-17 16:20:12 -05:00
commit beb87dd97a

@ -7,3 +7,5 @@ services:
proxy:
build: ./nginx-ingress
image: local/nginx-ingress:acs
ports:
- 8080:8080