aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-08-17 00:02:43 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-17 00:02:43 +0000
commitc4e26cae3b8f51efbd1b643cbfd04b6353ea24d0 (patch)
treea248a68a85f62ce6ea9ac04221085052fd2688e4
parenta39795202418582a6c1ce5ff77191c3acbf36bb3 (diff)
parente17b5ec6228eb2077718d3484447912211c34e29 (diff)
Merge "Add further configuration for the docker engine"
-rwxr-xr-xbootstrap/vagrant-onap/lib/functions9
1 files changed, 6 insertions, 3 deletions
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 9b903d92a..458b34c61 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -100,14 +100,17 @@ function install_maven {
_configure_maven
}
-# _configure_docker_proxy() - Configures proxy in Docker from ENV
-function _configure_docker_proxy {
+# _configure_docker_settings() - Configures Docker settings
+function _configure_docker_settings {
if [ $http_proxy ]; then
echo "export http_proxy=$http_proxy" >> /etc/default/docker
fi
if [ $https_proxy ]; then
echo "export https_proxy=$https_proxy" >> /etc/default/docker
fi
+
+ echo "DOCKER_OPTS=\"-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock\"" >> /etc/default/docker
+ usermod -a -G docker vagrant
}
# install_nodejs() - Download and install NodeJS
@@ -156,7 +159,7 @@ function install_docker {
$(lsb_release -cs) \
stable"
install_package docker-ce
- _configure_docker_proxy
+ _configure_docker_settings
service docker restart
sleep 10
}