Merge pull request #1 from johnbellone/master

Apply an HTTP_PROXY for us corporate shills.
sous-chefs · Jul 3, 2013 · 2a95fea · 2a95fea
2 parents 5da9436 + ff6b7c0
commit 2a95fea
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/templates/default/docker.conf.erb b/templates/default/docker.conf.erb
@@ -7,6 +7,9 @@ start on runlevel [3]
 respawn
 
 script
+    <% if node['docker']['http_proxy'] %>
+    env HTTP_PROXY=<%= node['docker']['http_proxy'] %>
+    <% end %>
     test -f /etc/default/locale && . /etc/default/locale || true
     LANG=$LANG LC_ALL=$LANG <%= node['docker']['install_dir'] %>/docker -d
 end script