From d2a62c96cdbb12b2811e5d04e70adaadbd0cd350 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Tue, 26 Apr 2016 17:16:27 +0100
Subject: [PATCH] Improve Vagrants bootstrap.sh proxy support

* sudo is not needed as script already runs as root, using sudo would
  require http_* env vars to be carried through.

* Add a systemd unit file to configure docker proxy support

* Update /etc/bashrc if available proxy

TrivialFix

Change-Id: If2571389ec3dc5bce9e819acf962d202b3166b97
---
 dev/vagrant/bootstrap.sh | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh
index ace58ecba1..7e8a006b03 100644
--- a/dev/vagrant/bootstrap.sh
+++ b/dev/vagrant/bootstrap.sh
@@ -21,7 +21,8 @@ else
     REGISTRY_PORT=5000
     SUPPORT_NODE=support01
 fi
-REGISTRY=operator.local:${REGISTRY_PORT}
+REGISTRY_URL="operator.local"
+REGISTRY=${REGISTRY_URL}:${REGISTRY_PORT}
 ADMIN_PROTOCOL="http"
 
 function _ensure_lsb_release {
@@ -30,9 +31,9 @@ function _ensure_lsb_release {
     fi
 
     if [[ -x $(which apt-get 2>/dev/null) ]]; then
-        sudo apt-get install -y lsb-release
+        apt-get install -y lsb-release
     elif [[ -x $(which yum 2>/dev/null) ]]; then
-        sudo yum -y install redhat-lsb-core
+        yum -y install redhat-lsb-core
     fi
 }
 
@@ -124,6 +125,20 @@ EOF
         exit 1
     fi
 
+    if [[ "${http_proxy}" != "" ]]; then
+        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}"
+EOF
+
+        if [[ "$(grep http_ /etc/bashrc)" == "" ]]; then
+            echo "export http_proxy=${http_proxy}" >> /etc/bashrc
+            echo "export https_proxy=${https_proxy}" >> /etc/bashrc
+        fi
+    fi
+
     systemctl daemon-reload
     systemctl enable docker
     systemctl start docker