Fix docker daemon proxy support in vagrant

There was an unwanted line break in the systemd file preventing the proxy from
being configured correctly.


Change-Id: I3e6413d4f2d373951cb558e0af1b8bc92d4cbb91
This commit is contained in:
Paul Bourke 2016-06-23 14:21:10 +01:00
parent d1be7fdb65
commit a43a8d77a9
1 changed files with 1 additions and 2 deletions

View File

@ -127,8 +127,7 @@ EOF
mkdir -p /etc/systemd/system/docker.service.d
cat >/etc/systemd/system/docker.service.d/http-proxy.conf <<-EOF
Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}"
Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=localhost,,${REGISTRY_URL}"
if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then