From d7d0e51f38b8b6e0be418ca69c4de0c4d6530b07 Mon Sep 17 00:00:00 2001
From: Anders Janmyr <anders@janmyr.com>
Date: Wed, 7 Jan 2015 12:57:24 +0100
Subject: [PATCH] Add ProxyFromEnvironment enables client via proxy.

Signed-off-by: Anders Janmyr <anders@janmyr.com>
Upstream-commit: 43d45e601fa13bc43228ae3b76b1b5c5737b0558
Component: engine
---
 components/engine/api/client/cli.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/engine/api/client/cli.go b/components/engine/api/client/cli.go
index 9f034d6c43..8c91f5fd74 100644
--- a/components/engine/api/client/cli.go
+++ b/components/engine/api/client/cli.go
@@ -155,6 +155,7 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, key libtrust.PrivateKey,
 
 	// The transport is created here for reuse during the client session
 	tr := &http.Transport{
+		Proxy:           http.ProxyFromEnvironment,
 		TLSClientConfig: tlsConfig,
 	}