From a43a8d77a94894fa76235fd5368d01ed1191fdb4 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Thu, 23 Jun 2016 14:21:10 +0100 Subject: [PATCH] Fix docker daemon proxy support in vagrant There was an unwanted line break in the systemd file preventing the proxy from being configured correctly. TrivialFix Change-Id: I3e6413d4f2d373951cb558e0af1b8bc92d4cbb91 --- dev/vagrant/bootstrap.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index 1d6116bac1..6ae1727acd 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -127,8 +127,7 @@ EOF mkdir -p /etc/systemd/system/docker.service.d cat >/etc/systemd/system/docker.service.d/http-proxy.conf <<-EOF [Service] -Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" -"NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}" +Environment="HTTP_PROXY=${http_proxy}" "HTTPS_PROXY=${https_proxy}" "NO_PROXY=localhost,127.0.0.1,${REGISTRY_URL}" EOF if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then