openstack
/
devstack-plugin-container
Code Issues Proposed changes

Update docker with proxy configuration 

Change-Id: I7089acb561d13726511bd10ca9d60738e7f4719a
Closes-Bug: #1684057
This commit is contained in:
cooldharma06 2017-04-26 10:33:15 -04:00
parent 69716eb42f
commit 7d1bd53785
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/docker
View File

@ -10,6 +10,10 @@
# ---------
# - install_docker
# The following variables are assumed to be defined by certain functions:
#
# - ``http_proxy`` ``https_proxy`` ``no_proxy``
# Save trace setting
_XTRACE_DOCKER=$(set +o | grep xtrace)
set +o xtrace
@ -93,6 +97,9 @@ EOF
[Service]
ExecStart=
ExecStart=/usr/bin/dockerd --config-file=$docker_config_file
[Service]
Environment="HTTP_PROXY=$http_proxy" "HTTPS_PROXY=$https_proxy" "NO_PROXY=$no_proxy"
EOF
sudo systemctl daemon-reload
sudo systemctl --no-block restart docker.service