From ff6b7c024665e7cb523b666648ad7853566964c5 Mon Sep 17 00:00:00 2001
From: John Bellone <john.bellone.jr@gmail.com>
Date: Wed, 3 Jul 2013 14:09:29 -0400
Subject: [PATCH] Update docker.conf.erb for an HTTP_PROXY.

This helps all of us that are stuck in the corporate world. Use upstart to export an HTTP_PROXY which is specified through the configuration.
---
 templates/default/docker.conf.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/default/docker.conf.erb b/templates/default/docker.conf.erb
index 09aad96024..3bb67ed224 100644
--- 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