kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Add support for forwarding Docker client through SOCKS proxy

Browse source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2016-02-16 10:05:05 -08:00
parent 16effc66c0
commit 05002c2501
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
daemon/info.go
View file

@ -20,6 +20,7 @@ import (
"github.com/docker/docker/utils" "github.com/docker/docker/utils"
"github.com/docker/docker/volume/drivers" "github.com/docker/docker/volume/drivers"
"github.com/docker/engine-api/types" "github.com/docker/engine-api/types"
"github.com/docker/go-connections/sockets"
) )
// SystemInfo returns information about the host server the daemon is running on. // SystemInfo returns information about the host server the daemon is running on.
@ -97,9 +98,9 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
ServerVersion: dockerversion.Version, ServerVersion: dockerversion.Version,
ClusterStore: daemon.configStore.ClusterStore, ClusterStore: daemon.configStore.ClusterStore,
ClusterAdvertise: daemon.configStore.ClusterAdvertise, ClusterAdvertise: daemon.configStore.ClusterAdvertise,
HTTPProxy: getProxyEnv("http_proxy"), HTTPProxy: sockets.GetProxyEnv("http_proxy"),
HTTPSProxy: getProxyEnv("https_proxy"), HTTPSProxy: sockets.GetProxyEnv("https_proxy"),
NoProxy: getProxyEnv("no_proxy"), NoProxy: sockets.GetProxyEnv("no_proxy"),
} }
// TODO Windows. Refactor this more once sysinfo is refactored into // TODO Windows. Refactor this more once sysinfo is refactored into

2
integration-cli/docker_utils.go
View file

@ -196,7 +196,7 @@ func (d *Daemon) getClientConfig() (*clientConfig, error) {
transport = &http.Transport{} transport = &http.Transport{}
} }
sockets.ConfigureTransport(transport, proto, addr) d.c.Assert(sockets.ConfigureTransport(transport, proto, addr), check.IsNil)
return &clientConfig{ return &clientConfig{
transport: transport, transport: transport,

4
pkg/plugins/client.go
View file

@ -30,7 +30,9 @@ func NewClient(addr string, tlsConfig tlsconfig.Options) (*Client, error) {
tr.TLSClientConfig = c tr.TLSClientConfig = c
protoAndAddr := strings.Split(addr, "://") protoAndAddr := strings.Split(addr, "://")
sockets.ConfigureTransport(tr, protoAndAddr[0], protoAndAddr[1]) if err := sockets.ConfigureTransport(tr, protoAndAddr[0], protoAndAddr[1]); err != nil {
return nil, err
}
scheme := protoAndAddr[0] scheme := protoAndAddr[0]
if scheme != "https" { if scheme != "https" {