diff options
| -rw-r--r-- | dev/vagrant/bootstrap.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index ace58ecba..7e8a006b0 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 |