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

This commit is contained in:
Brian Long 2020-12-17 16:16:57 -05:00
commit db6a1e148c

View File

@ -23,4 +23,4 @@ services:
proxy: proxy:
build: ./nginx-ingress build: ./nginx-ingress
image: local/nginx-ingress:base image: local/nginx-ingress:acs