From 05135dd64594c3ff0ed81c45fb35bf2275eea00c Mon Sep 17 00:00:00 2001 From: Marcos Lilljedahl Date: Sun, 17 Sep 2017 23:00:45 -0300 Subject: [PATCH] Use port 2376 for SSL daemon configuration --- docker/factory.go | 5 ++++- dockerfiles/dind/ee/daemon.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/factory.go b/docker/factory.go index 9c84ce9..46951a4 100644 --- a/docker/factory.go +++ b/docker/factory.go @@ -21,11 +21,12 @@ type FactoryApi interface { } func NewClient(instance *types.Instance, proxyHost string) (*client.Client, error) { - host := router.EncodeHost(instance.SessionId, instance.RoutableIP, router.HostOpts{EncodedPort: 2375}) + var host string var durl string var tlsConfig *tls.Config if (len(instance.Cert) > 0 && len(instance.Key) > 0) || instance.Tls { + host = router.EncodeHost(instance.SessionId, instance.RoutableIP, router.HostOpts{EncodedPort: 2376}) tlsConfig = tlsconfig.ClientDefault() tlsConfig.InsecureSkipVerify = true tlsConfig.ServerName = host @@ -36,6 +37,8 @@ func NewClient(instance *types.Instance, proxyHost string) (*client.Client, erro } tlsConfig.Certificates = []tls.Certificate{tlsCert} } + } else { + host = router.EncodeHost(instance.SessionId, instance.RoutableIP, router.HostOpts{EncodedPort: 2376}) } transport := &http.Transport{ diff --git a/dockerfiles/dind/ee/daemon.json b/dockerfiles/dind/ee/daemon.json index 8b2b06f..d2e0163 100644 --- a/dockerfiles/dind/ee/daemon.json +++ b/dockerfiles/dind/ee/daemon.json @@ -3,7 +3,7 @@ "debug": true, "log-level": "info", "insecure-registries": ["127.0.0.1"], - "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2375"], + "hosts": ["unix:///var/run/docker.sock", "tcp://0.0.0.0:2376"], "tls": true, "tlscert": "/var/run/pwd/certs/cert.pem", "tlskey": "/var/run/pwd/certs/key.pem"