From 380c8320a78dc16da65d9d13004422ac5a0cca53 Mon Sep 17 00:00:00 2001
From: unclejack <unclejacksons@gmail.com>
Date: Sat, 16 Aug 2014 13:27:04 +0300
Subject: [PATCH 1/9] make http usage for registry explicit

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)

Conflicts:
	daemon/config.go
	daemon/daemon.go
	graph/pull.go
	graph/push.go
	graph/tags.go
	registry/registry.go
	registry/service.go
---
 daemon/config.go                          |  2 +
 daemon/daemon.go                          |  2 +-
 docs/sources/reference/commandline/cli.md |  3 +-
 graph/pull.go                             |  4 +-
 graph/push.go                             |  4 +-
 graph/tags.go                             | 24 ++++++-----
 registry/registry.go                      | 49 +++++++++++++++++++++++
 registry/service.go                       |  2 +-
 8 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/daemon/config.go b/daemon/config.go
index 8780294ce1..bae0c8cd29 100644
--- a/daemon/config.go
+++ b/daemon/config.go
@@ -31,6 +31,7 @@ type Config struct {
 	BridgeIface                 string
 	BridgeIP                    string
 	FixedCIDR                   string
+	InsecureRegistries          []string
 	InterContainerCommunication bool
 	GraphDriver                 string
 	GraphOptions                []string
@@ -55,6 +56,7 @@ func (config *Config) InstallFlags() {
 	flag.StringVar(&config.BridgeIP, []string{"#bip", "-bip"}, "", "Use this CIDR notation address for the network bridge's IP, not compatible with -b")
 	flag.StringVar(&config.BridgeIface, []string{"b", "-bridge"}, "", "Attach containers to a pre-existing network bridge\nuse 'none' to disable container networking")
 	flag.StringVar(&config.FixedCIDR, []string{"-fixed-cidr"}, "", "IPv4 subnet for fixed IPs (ex: 10.20.0.0/16)\nthis subnet must be nested in the bridge subnet (which is defined by -b or --bip)")
+	opts.ListVar(&config.InsecureRegistries, []string{"-insecure-registry"}, "Make these registries use http")
 	flag.BoolVar(&config.InterContainerCommunication, []string{"#icc", "-icc"}, true, "Enable inter-container communication")
 	flag.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", "Force the Docker runtime to use a specific storage driver")
 	flag.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, "native", "Force the Docker runtime to use a specific exec driver")
diff --git a/daemon/daemon.go b/daemon/daemon.go
index 658d578e4e..7922bf1bcf 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -832,7 +832,7 @@ func NewDaemonFromDirectory(config *Config, eng *engine.Engine) (*Daemon, error)
 	}
 
 	log.Debugf("Creating repository list")
-	repositories, err := graph.NewTagStore(path.Join(config.Root, "repositories-"+driver.String()), g, config.Mirrors)
+	repositories, err := graph.NewTagStore(path.Join(config.Root, "repositories-"+driver.String()), g, config.Mirrors, config.InsecureRegistries)
 	if err != nil {
 		return nil, fmt.Errorf("Couldn't create Tag store: %s", err)
 	}
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index e1beaeb29c..128228a635 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -70,7 +70,8 @@ expect an integer, and they can only be specified once.
       -g, --graph="/var/lib/docker"              Path to use as the root of the Docker runtime
       -H, --host=[]                              The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
       --icc=true                                 Enable inter-container communication
-      --ip=0.0.0.0                               Default IP address to use when binding container ports
+      --insecure-registry=[]                     Make these registries use http
+      --ip=0.0.0.0                             Default IP address to use when binding container ports
       --ip-forward=true                          Enable net.ipv4.ip_forward
       --ip-masq=true                             Enable IP masquerading for bridge's IP range
       --iptables=true                            Enable Docker's addition of iptables rules
diff --git a/graph/pull.go b/graph/pull.go
index 9345d7d489..942a234458 100644
--- a/graph/pull.go
+++ b/graph/pull.go
@@ -113,7 +113,9 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status {
 		return job.Error(err)
 	}
 
-	endpoint, err := registry.NewEndpoint(hostname)
+	secure := registry.IsSecure(hostname, s.InsecureRegistries)
+
+	endpoint, err := registry.NewEndpoint(hostname, secure)
 	if err != nil {
 		return job.Error(err)
 	}
diff --git a/graph/push.go b/graph/push.go
index a2bd7136f9..8ffcd88be2 100644
--- a/graph/push.go
+++ b/graph/push.go
@@ -214,7 +214,9 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status {
 		return job.Error(err)
 	}
 
-	endpoint, err := registry.NewEndpoint(hostname)
+	secure := registry.IsSecure(hostname, s.InsecureRegistries)
+
+	endpoint, err := registry.NewEndpoint(hostname, secure)
 	if err != nil {
 		return job.Error(err)
 	}
diff --git a/graph/tags.go b/graph/tags.go
index 6e4e63148a..d458633ff1 100644
--- a/graph/tags.go
+++ b/graph/tags.go
@@ -23,10 +23,11 @@ var (
 )
 
 type TagStore struct {
-	path         string
-	graph        *Graph
-	mirrors      []string
-	Repositories map[string]Repository
+	path               string
+	graph              *Graph
+	mirrors            []string
+	InsecureRegistries []string
+	Repositories       map[string]Repository
 	sync.Mutex
 	// FIXME: move push/pull-related fields
 	// to a helper type
@@ -54,18 +55,19 @@ func (r Repository) Contains(u Repository) bool {
 	return true
 }
 
-func NewTagStore(path string, graph *Graph, mirrors []string) (*TagStore, error) {
+func NewTagStore(path string, graph *Graph, mirrors []string, insecureRegistries []string) (*TagStore, error) {
 	abspath, err := filepath.Abs(path)
 	if err != nil {
 		return nil, err
 	}
 	store := &TagStore{
-		path:         abspath,
-		graph:        graph,
-		mirrors:      mirrors,
-		Repositories: make(map[string]Repository),
-		pullingPool:  make(map[string]chan struct{}),
-		pushingPool:  make(map[string]chan struct{}),
+		path:               abspath,
+		graph:              graph,
+		mirrors:            mirrors,
+		InsecureRegistries: insecureRegistries,
+		Repositories:       make(map[string]Repository),
+		pullingPool:        make(map[string]chan struct{}),
+		pushingPool:        make(map[string]chan struct{}),
 	}
 	// Load the json file if it exists, otherwise create it.
 	if err := store.reload(); os.IsNotExist(err) {
diff --git a/registry/registry.go b/registry/registry.go
index 0b3ec12bf3..8599d3684b 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -213,6 +213,55 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
 	return hostname, reposName, nil
 }
 
+// this method expands the registry name as used in the prefix of a repo
+// to a full url. if it already is a url, there will be no change.
+func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (endpoint string, err error) {
+	if strings.HasPrefix(hostname, "http:") || strings.HasPrefix(hostname, "https:") {
+		// if there is no slash after https:// (8 characters) then we have no path in the url
+		if strings.LastIndex(hostname, "/") < 9 {
+			// there is no path given. Expand with default path
+			hostname = hostname + "/v1/"
+		}
+		if _, err := pingRegistryEndpoint(hostname); err != nil {
+			return "", errors.New("Invalid Registry endpoint: " + err.Error())
+		}
+		return hostname, nil
+	}
+
+	// use HTTPS if secure, otherwise use HTTP
+	if secure {
+		endpoint = fmt.Sprintf("https://%s/v1/", hostname)
+	} else {
+		endpoint = fmt.Sprintf("http://%s/v1/", hostname)
+	}
+	_, err = pingRegistryEndpoint(endpoint)
+	if err != nil {
+		//TODO: triggering highland build can be done there without "failing"
+		err = fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, err)
+		if secure {
+			err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", err, hostname)
+		}
+		return "", err
+	}
+	return endpoint, nil
+}
+
+// this method verifies if the provided hostname is part of the list of
+// insecure registries and returns false if HTTP should be used
+func IsSecure(hostname string, insecureRegistries []string) (secure bool) {
+	secure = true
+	for _, h := range insecureRegistries {
+		if hostname == h {
+			secure = false
+			break
+		}
+	}
+	if hostname == IndexServerAddress() {
+		secure = true
+	}
+	return
+}
+
 func trustedLocation(req *http.Request) bool {
 	var (
 		trusteds = []string{"docker.com", "docker.io"}
diff --git a/registry/service.go b/registry/service.go
index f7b353000e..334e7c2ed6 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -40,7 +40,7 @@ func (s *Service) Auth(job *engine.Job) engine.Status {
 	job.GetenvJson("authConfig", authConfig)
 	// TODO: this is only done here because auth and registry need to be merged into one pkg
 	if addr := authConfig.ServerAddress; addr != "" && addr != IndexServerAddress() {
-		endpoint, err := NewEndpoint(addr)
+		endpoint, err := NewEndpoint(addr, true)
 		if err != nil {
 			return job.Error(err)
 		}

From f29b2e48ebfb171f58375b6e355910fc2192aceb Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@docker.com>
Date: Tue, 19 Aug 2014 11:54:42 -0700
Subject: [PATCH 2/9] Refactor IsSecure change

Fix issue with restoring the tag store and setting static configuration
from the daemon. i.e. the field on the TagStore struct must be made
internal or the json.Unmarshal in restore will overwrite the insecure
registries to be an empty struct.

Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	graph/pull.go
	graph/push.go
	graph/tags.go
---
 graph/pull.go        |  2 +-
 graph/push.go        |  2 +-
 graph/tags.go        |  5 +++--
 registry/registry.go | 44 +++++++++++++++++++-------------------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/graph/pull.go b/graph/pull.go
index 942a234458..3cc48fa699 100644
--- a/graph/pull.go
+++ b/graph/pull.go
@@ -113,7 +113,7 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status {
 		return job.Error(err)
 	}
 
-	secure := registry.IsSecure(hostname, s.InsecureRegistries)
+	secure := registry.IsSecure(hostname, s.insecureRegistries)
 
 	endpoint, err := registry.NewEndpoint(hostname, secure)
 	if err != nil {
diff --git a/graph/push.go b/graph/push.go
index 8ffcd88be2..4cda8914b3 100644
--- a/graph/push.go
+++ b/graph/push.go
@@ -214,7 +214,7 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status {
 		return job.Error(err)
 	}
 
-	secure := registry.IsSecure(hostname, s.InsecureRegistries)
+	secure := registry.IsSecure(hostname, s.insecureRegistries)
 
 	endpoint, err := registry.NewEndpoint(hostname, secure)
 	if err != nil {
diff --git a/graph/tags.go b/graph/tags.go
index d458633ff1..5c3e533b2a 100644
--- a/graph/tags.go
+++ b/graph/tags.go
@@ -26,7 +26,7 @@ type TagStore struct {
 	path               string
 	graph              *Graph
 	mirrors            []string
-	InsecureRegistries []string
+	insecureRegistries []string
 	Repositories       map[string]Repository
 	sync.Mutex
 	// FIXME: move push/pull-related fields
@@ -60,11 +60,12 @@ func NewTagStore(path string, graph *Graph, mirrors []string, insecureRegistries
 	if err != nil {
 		return nil, err
 	}
+
 	store := &TagStore{
 		path:               abspath,
 		graph:              graph,
 		mirrors:            mirrors,
-		InsecureRegistries: insecureRegistries,
+		insecureRegistries: insecureRegistries,
 		Repositories:       make(map[string]Repository),
 		pullingPool:        make(map[string]chan struct{}),
 		pushingPool:        make(map[string]chan struct{}),
diff --git a/registry/registry.go b/registry/registry.go
index 8599d3684b..788996811b 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -215,51 +215,45 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
 
 // this method expands the registry name as used in the prefix of a repo
 // to a full url. if it already is a url, there will be no change.
-func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (endpoint string, err error) {
-	if strings.HasPrefix(hostname, "http:") || strings.HasPrefix(hostname, "https:") {
-		// if there is no slash after https:// (8 characters) then we have no path in the url
-		if strings.LastIndex(hostname, "/") < 9 {
-			// there is no path given. Expand with default path
-			hostname = hostname + "/v1/"
-		}
-		if _, err := pingRegistryEndpoint(hostname); err != nil {
-			return "", errors.New("Invalid Registry endpoint: " + err.Error())
-		}
+func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (string, error) {
+	if hostname == IndexServerAddress() {
 		return hostname, nil
 	}
 
-	// use HTTPS if secure, otherwise use HTTP
+	endpoint := fmt.Sprintf("http://%s/v1/", hostname)
+
 	if secure {
 		endpoint = fmt.Sprintf("https://%s/v1/", hostname)
-	} else {
-		endpoint = fmt.Sprintf("http://%s/v1/", hostname)
 	}
-	_, err = pingRegistryEndpoint(endpoint)
-	if err != nil {
+
+	if _, oerr := pingRegistryEndpoint(endpoint); oerr != nil {
 		//TODO: triggering highland build can be done there without "failing"
-		err = fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, err)
+		err := fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, oerr)
+
 		if secure {
-			err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", err, hostname)
+			err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", oerr, hostname)
 		}
+
 		return "", err
 	}
+
 	return endpoint, nil
 }
 
 // this method verifies if the provided hostname is part of the list of
 // insecure registries and returns false if HTTP should be used
-func IsSecure(hostname string, insecureRegistries []string) (secure bool) {
-	secure = true
+func IsSecure(hostname string, insecureRegistries []string) bool {
+	if hostname == IndexServerAddress() {
+		return true
+	}
+
 	for _, h := range insecureRegistries {
 		if hostname == h {
-			secure = false
-			break
+			return false
 		}
 	}
-	if hostname == IndexServerAddress() {
-		secure = true
-	}
-	return
+
+	return true
 }
 
 func trustedLocation(req *http.Request) bool {

From 48f7384d6365c59b4b61d527630aaf88af24f6dd Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@docker.com>
Date: Tue, 19 Aug 2014 12:27:23 -0700
Subject: [PATCH 3/9] Expand documentation for --insecure-registries

Signed-off-by: Michael Crosby <michael@docker.com>
---
 docs/sources/reference/commandline/cli.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index 128228a635..462d649203 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -71,7 +71,7 @@ expect an integer, and they can only be specified once.
       -H, --host=[]                              The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
       --icc=true                                 Enable inter-container communication
       --insecure-registry=[]                     Make these registries use http
-      --ip=0.0.0.0                             Default IP address to use when binding container ports
+      --ip=0.0.0.0                               Default IP address to use when binding container ports
       --ip-forward=true                          Enable net.ipv4.ip_forward
       --ip-masq=true                             Enable IP masquerading for bridge's IP range
       --iptables=true                            Enable Docker's addition of iptables rules
@@ -196,6 +196,16 @@ can be disabled with --ip-masq=false.
 
 
 
+By default docker will assume all registries are securied via TLS.  Prior versions
+of docker used an auto fallback if a registry did not support TLS.  This introduces
+the opportunity for MITM attacks so in Docker 1.2 the user must specify `--insecure-registries` 
+when starting the Docker daemon to state which registries are not using TLS and to communicate
+with these registries via plain text.  If you are running a local registry over plain text
+on `127.0.0.1:5000` you will be required to specify `--insecure-registries 127.0.0.1:500` 
+when starting the docker daemon to be able to push and pull images to that registry.
+No automatic fallback will happen after Docker 1.2 to detect if a registry is using
+HTTP or HTTPS.
+
 Docker supports softlinks for the Docker data directory
 (`/var/lib/docker`) and for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be set like this:
 

From afade4236d3f15704653132c364d6e7ccc975f8b Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@docker.com>
Date: Wed, 20 Aug 2014 08:31:24 -0700
Subject: [PATCH 4/9] Don't hard code true for auth job

Signed-off-by: Michael Crosby <michael@docker.com>

Conflicts:
	registry/service.go
---
 builtins/builtins.go |  4 ++--
 docker/daemon.go     |  7 +++++++
 registry/service.go  | 22 +++++++++++-----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/builtins/builtins.go b/builtins/builtins.go
index f952d728b2..41bb249286 100644
--- a/builtins/builtins.go
+++ b/builtins/builtins.go
@@ -10,7 +10,6 @@ import (
 	"github.com/docker/docker/engine"
 	"github.com/docker/docker/events"
 	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/registry"
 )
 
 func Register(eng *engine.Engine) error {
@@ -26,7 +25,8 @@ func Register(eng *engine.Engine) error {
 	if err := eng.Register("version", dockerVersion); err != nil {
 		return err
 	}
-	return registry.NewService().Install(eng)
+
+	return nil
 }
 
 // remote: a RESTful api for cross-docker communication
diff --git a/docker/daemon.go b/docker/daemon.go
index dd0baa5fa4..f2c0310f1f 100644
--- a/docker/daemon.go
+++ b/docker/daemon.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/engine"
 	flag "github.com/docker/docker/pkg/mflag"
 	"github.com/docker/docker/pkg/signal"
+	"github.com/docker/docker/registry"
 )
 
 const CanDaemon = true
@@ -32,11 +33,17 @@ func mainDaemon() {
 	}
 	eng := engine.New()
 	signal.Trap(eng.Shutdown)
+
 	// Load builtins
 	if err := builtins.Register(eng); err != nil {
 		log.Fatal(err)
 	}
 
+	// load registry service
+	if err := registry.NewService(daemonCfg.InsecureRegistries).Install(eng); err != nil {
+		log.Fatal(err)
+	}
+
 	// load the daemon in the background so we can immediately start
 	// the http api so that connections don't fail while the daemon
 	// is booting
diff --git a/registry/service.go b/registry/service.go
index 334e7c2ed6..890837ca5e 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -13,12 +13,15 @@ import (
 //  'pull': Download images from any registry (TODO)
 //  'push': Upload images to any registry (TODO)
 type Service struct {
+	insecureRegistries []string
 }
 
 // NewService returns a new instance of Service ready to be
 // installed no an engine.
-func NewService() *Service {
-	return &Service{}
+func NewService(insecureRegistries []string) *Service {
+	return &Service{
+		insecureRegistries: insecureRegistries,
+	}
 }
 
 // Install installs registry capabilities to eng.
@@ -32,15 +35,12 @@ func (s *Service) Install(eng *engine.Engine) error {
 // and returns OK if authentication was sucessful.
 // It can be used to verify the validity of a client's credentials.
 func (s *Service) Auth(job *engine.Job) engine.Status {
-	var (
-		err        error
-		authConfig = &AuthConfig{}
-	)
+	var authConfig = new(AuthConfig)
 
 	job.GetenvJson("authConfig", authConfig)
-	// TODO: this is only done here because auth and registry need to be merged into one pkg
+
 	if addr := authConfig.ServerAddress; addr != "" && addr != IndexServerAddress() {
-		endpoint, err := NewEndpoint(addr, true)
+		endpoint, err := NewEndpoint(addr, IsSecure(addr, s.insecureRegistries))
 		if err != nil {
 			return job.Error(err)
 		}
@@ -49,11 +49,11 @@ func (s *Service) Auth(job *engine.Job) engine.Status {
 		}
 		authConfig.ServerAddress = endpoint.String()
 	}
-	status, err := Login(authConfig, HTTPRequestFactory(nil))
-	if err != nil {
+
+	if _, err := Login(authConfig, HTTPRequestFactory(nil)); err != nil {
 		return job.Error(err)
 	}
-	job.Printf("%s\n", status)
+
 	return engine.StatusOK
 }
 

From 6a1ff022b0744213ed588d9c16dbb13ce055eda6 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Fri, 10 Oct 2014 23:22:12 -0400
Subject: [PATCH 5/9] Do not verify certificate when using --insecure-registry
 on an HTTPS registry

Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	registry/registry.go
	registry/registry_test.go
	registry/service.go
	registry/session.go

Conflicts:
	registry/endpoint.go
	registry/registry.go
---
 daemon/config.go                          |   2 +-
 docs/sources/reference/commandline/cli.md |  20 +--
 graph/tags_unit_test.go                   |   2 +-
 registry/endpoint.go                      |  51 ++++++--
 registry/endpoint_test.go                 |   2 +-
 registry/registry.go                      | 143 +++++++++-------------
 registry/registry_test.go                 |   4 +-
 registry/service.go                       |   5 +-
 registry/session.go                       |   2 +-
 9 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/daemon/config.go b/daemon/config.go
index bae0c8cd29..9e8d08e2a6 100644
--- a/daemon/config.go
+++ b/daemon/config.go
@@ -56,7 +56,7 @@ func (config *Config) InstallFlags() {
 	flag.StringVar(&config.BridgeIP, []string{"#bip", "-bip"}, "", "Use this CIDR notation address for the network bridge's IP, not compatible with -b")
 	flag.StringVar(&config.BridgeIface, []string{"b", "-bridge"}, "", "Attach containers to a pre-existing network bridge\nuse 'none' to disable container networking")
 	flag.StringVar(&config.FixedCIDR, []string{"-fixed-cidr"}, "", "IPv4 subnet for fixed IPs (ex: 10.20.0.0/16)\nthis subnet must be nested in the bridge subnet (which is defined by -b or --bip)")
-	opts.ListVar(&config.InsecureRegistries, []string{"-insecure-registry"}, "Make these registries use http")
+	opts.ListVar(&config.InsecureRegistries, []string{"-insecure-registry"}, "Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback)")
 	flag.BoolVar(&config.InterContainerCommunication, []string{"#icc", "-icc"}, true, "Enable inter-container communication")
 	flag.StringVar(&config.GraphDriver, []string{"s", "-storage-driver"}, "", "Force the Docker runtime to use a specific storage driver")
 	flag.StringVar(&config.ExecDriver, []string{"e", "-exec-driver"}, "native", "Force the Docker runtime to use a specific exec driver")
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index 462d649203..1d4202811d 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -70,7 +70,7 @@ expect an integer, and they can only be specified once.
       -g, --graph="/var/lib/docker"              Path to use as the root of the Docker runtime
       -H, --host=[]                              The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
       --icc=true                                 Enable inter-container communication
-      --insecure-registry=[]                     Make these registries use http
+      --insecure-registry=[]                     Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback)
       --ip=0.0.0.0                               Default IP address to use when binding container ports
       --ip-forward=true                          Enable net.ipv4.ip_forward
       --ip-masq=true                             Enable IP masquerading for bridge's IP range
@@ -195,16 +195,16 @@ to other machines on the Internet. This may interfere with some network topologi
 can be disabled with --ip-masq=false.
 
 
+By default, Docker will assume all registries are secured via TLS with certificate verification
+enabled. Prior versions of Docker used an auto fallback if a registry did not support TLS
+(or if the TLS connection failed). This introduced the opportunity for Man In The Middle (MITM)
+attacks, so as of Docker 1.3.1, the user must now specify the `--insecure-registry` daemon flag
+for each insecure registry. An insecure registry is either not using TLS (i.e. plain text HTTP),
+or is using TLS with a CA certificate not known by the Docker daemon (i.e. certification
+verification disabled). For example, if there is a registry listening for HTTP at 127.0.0.1:5000,
+as of Docker 1.3.1 you are required to specify `--insecure-registry 127.0.0.1:5000` when starting
+the Docker daemon.
 
-By default docker will assume all registries are securied via TLS.  Prior versions
-of docker used an auto fallback if a registry did not support TLS.  This introduces
-the opportunity for MITM attacks so in Docker 1.2 the user must specify `--insecure-registries` 
-when starting the Docker daemon to state which registries are not using TLS and to communicate
-with these registries via plain text.  If you are running a local registry over plain text
-on `127.0.0.1:5000` you will be required to specify `--insecure-registries 127.0.0.1:500` 
-when starting the docker daemon to be able to push and pull images to that registry.
-No automatic fallback will happen after Docker 1.2 to detect if a registry is using
-HTTP or HTTPS.
 
 Docker supports softlinks for the Docker data directory
 (`/var/lib/docker`) and for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be set like this:
diff --git a/graph/tags_unit_test.go b/graph/tags_unit_test.go
index e4f1fb809f..da512547d5 100644
--- a/graph/tags_unit_test.go
+++ b/graph/tags_unit_test.go
@@ -53,7 +53,7 @@ func mkTestTagStore(root string, t *testing.T) *TagStore {
 	if err != nil {
 		t.Fatal(err)
 	}
-	store, err := NewTagStore(path.Join(root, "tags"), graph, nil)
+	store, err := NewTagStore(path.Join(root, "tags"), graph, nil, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/registry/endpoint.go b/registry/endpoint.go
index 639c997039..88dbeafd96 100644
--- a/registry/endpoint.go
+++ b/registry/endpoint.go
@@ -2,7 +2,6 @@ package registry
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -34,27 +33,40 @@ func scanForAPIVersion(hostname string) (string, APIVersion) {
 	return hostname, DefaultAPIVersion
 }
 
-func NewEndpoint(hostname string) (*Endpoint, error) {
-	endpoint, err := newEndpoint(hostname)
+func NewEndpoint(hostname string, secure bool) (*Endpoint, error) {
+	endpoint, err := newEndpoint(hostname, secure)
 	if err != nil {
 		return nil, err
 	}
 
+	// Try HTTPS ping to registry
 	endpoint.URL.Scheme = "https"
 	if _, err := endpoint.Ping(); err != nil {
-		log.Debugf("Registry %s does not work (%s), falling back to http", endpoint, err)
-		// TODO: Check if http fallback is enabled
-		endpoint.URL.Scheme = "http"
-		if _, err = endpoint.Ping(); err != nil {
-			return nil, errors.New("Invalid Registry endpoint: " + err.Error())
+
+		//TODO: triggering highland build can be done there without "failing"
+
+		if secure {
+			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
+			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.
+			return nil, fmt.Errorf("Invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /etc/docker/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
 		}
+
+		// If registry is insecure and HTTPS failed, fallback to HTTP.
+		log.Debugf("Error from registry %q marked as insecure: %v. Insecurely falling back to HTTP", endpoint, err)
+		endpoint.URL.Scheme = "http"
+		_, err2 := endpoint.Ping()
+		if err2 == nil {
+			return endpoint, nil
+		}
+
+		return nil, fmt.Errorf("Invalid registry endpoint %q. HTTPS attempt: %v. HTTP attempt: %v", endpoint, err, err2)
 	}
 
 	return endpoint, nil
 }
-func newEndpoint(hostname string) (*Endpoint, error) {
+func newEndpoint(hostname string, secure bool) (*Endpoint, error) {
 	var (
-		endpoint        Endpoint
+		endpoint        = Endpoint{secure: secure}
 		trimmedHostname string
 		err             error
 	)
@@ -72,6 +84,7 @@ func newEndpoint(hostname string) (*Endpoint, error) {
 type Endpoint struct {
 	URL     *url.URL
 	Version APIVersion
+	secure  bool
 }
 
 // Get the formated URL for the root of this registry Endpoint
@@ -95,7 +108,7 @@ func (e Endpoint) Ping() (RegistryInfo, error) {
 		return RegistryInfo{Standalone: false}, err
 	}
 
-	resp, _, err := doRequest(req, nil, ConnectTimeout)
+	resp, _, err := doRequest(req, nil, ConnectTimeout, e.secure)
 	if err != nil {
 		return RegistryInfo{Standalone: false}, err
 	}
@@ -134,3 +147,19 @@ func (e Endpoint) Ping() (RegistryInfo, error) {
 	log.Debugf("RegistryInfo.Standalone: %t", info.Standalone)
 	return info, nil
 }
+
+// IsSecure returns false if the provided hostname is part of the list of insecure registries.
+// Insecure registries accept HTTP and/or accept HTTPS with certificates from unknown CAs.
+func IsSecure(hostname string, insecureRegistries []string) bool {
+	if hostname == IndexServerAddress() {
+		return true
+	}
+
+	for _, h := range insecureRegistries {
+		if hostname == h {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/registry/endpoint_test.go b/registry/endpoint_test.go
index 0ec1220d9c..def5e0d7ae 100644
--- a/registry/endpoint_test.go
+++ b/registry/endpoint_test.go
@@ -12,7 +12,7 @@ func TestEndpointParse(t *testing.T) {
 		{"0.0.0.0:5000", "https://0.0.0.0:5000/v1/"},
 	}
 	for _, td := range testData {
-		e, err := newEndpoint(td.str)
+		e, err := newEndpoint(td.str, true)
 		if err != nil {
 			t.Errorf("%q: %s", td.str, err)
 		}
diff --git a/registry/registry.go b/registry/registry.go
index 788996811b..8d43637495 100644
--- a/registry/registry.go
+++ b/registry/registry.go
@@ -14,6 +14,7 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/docker/docker/utils"
 )
 
@@ -35,7 +36,7 @@ const (
 	ConnectTimeout
 )
 
-func newClient(jar http.CookieJar, roots *x509.CertPool, cert *tls.Certificate, timeout TimeoutType) *http.Client {
+func newClient(jar http.CookieJar, roots *x509.CertPool, cert *tls.Certificate, timeout TimeoutType, secure bool) *http.Client {
 	tlsConfig := tls.Config{
 		RootCAs: roots,
 		// Avoid fallback to SSL protocols < TLS1.0
@@ -46,6 +47,10 @@ func newClient(jar http.CookieJar, roots *x509.CertPool, cert *tls.Certificate,
 		tlsConfig.Certificates = append(tlsConfig.Certificates, *cert)
 	}
 
+	if !secure {
+		tlsConfig.InsecureSkipVerify = true
+	}
+
 	httpTransport := &http.Transport{
 		DisableKeepAlives: true,
 		Proxy:             http.ProxyFromEnvironment,
@@ -86,69 +91,76 @@ func newClient(jar http.CookieJar, roots *x509.CertPool, cert *tls.Certificate,
 	}
 }
 
-func doRequest(req *http.Request, jar http.CookieJar, timeout TimeoutType) (*http.Response, *http.Client, error) {
-	hasFile := func(files []os.FileInfo, name string) bool {
-		for _, f := range files {
-			if f.Name() == name {
-				return true
-			}
-		}
-		return false
-	}
-
-	hostDir := path.Join("/etc/docker/certs.d", req.URL.Host)
-	fs, err := ioutil.ReadDir(hostDir)
-	if err != nil && !os.IsNotExist(err) {
-		return nil, nil, err
-	}
-
+func doRequest(req *http.Request, jar http.CookieJar, timeout TimeoutType, secure bool) (*http.Response, *http.Client, error) {
 	var (
 		pool  *x509.CertPool
 		certs []*tls.Certificate
 	)
 
-	for _, f := range fs {
-		if strings.HasSuffix(f.Name(), ".crt") {
-			if pool == nil {
-				pool = x509.NewCertPool()
+	if secure && req.URL.Scheme == "https" {
+		hasFile := func(files []os.FileInfo, name string) bool {
+			for _, f := range files {
+				if f.Name() == name {
+					return true
+				}
 			}
-			data, err := ioutil.ReadFile(path.Join(hostDir, f.Name()))
-			if err != nil {
-				return nil, nil, err
-			}
-			pool.AppendCertsFromPEM(data)
+			return false
 		}
-		if strings.HasSuffix(f.Name(), ".cert") {
-			certName := f.Name()
-			keyName := certName[:len(certName)-5] + ".key"
-			if !hasFile(fs, keyName) {
-				return nil, nil, fmt.Errorf("Missing key %s for certificate %s", keyName, certName)
-			}
-			cert, err := tls.LoadX509KeyPair(path.Join(hostDir, certName), path.Join(hostDir, keyName))
-			if err != nil {
-				return nil, nil, err
-			}
-			certs = append(certs, &cert)
+
+		hostDir := path.Join("/etc/docker/certs.d", req.URL.Host)
+		log.Debugf("hostDir: %s", hostDir)
+		fs, err := ioutil.ReadDir(hostDir)
+		if err != nil && !os.IsNotExist(err) {
+			return nil, nil, err
 		}
-		if strings.HasSuffix(f.Name(), ".key") {
-			keyName := f.Name()
-			certName := keyName[:len(keyName)-4] + ".cert"
-			if !hasFile(fs, certName) {
-				return nil, nil, fmt.Errorf("Missing certificate %s for key %s", certName, keyName)
+
+		for _, f := range fs {
+			if strings.HasSuffix(f.Name(), ".crt") {
+				if pool == nil {
+					pool = x509.NewCertPool()
+				}
+				log.Debugf("crt: %s", hostDir+"/"+f.Name())
+				data, err := ioutil.ReadFile(path.Join(hostDir, f.Name()))
+				if err != nil {
+					return nil, nil, err
+				}
+				pool.AppendCertsFromPEM(data)
+			}
+			if strings.HasSuffix(f.Name(), ".cert") {
+				certName := f.Name()
+				keyName := certName[:len(certName)-5] + ".key"
+				log.Debugf("cert: %s", hostDir+"/"+f.Name())
+				if !hasFile(fs, keyName) {
+					return nil, nil, fmt.Errorf("Missing key %s for certificate %s", keyName, certName)
+				}
+				cert, err := tls.LoadX509KeyPair(path.Join(hostDir, certName), path.Join(hostDir, keyName))
+				if err != nil {
+					return nil, nil, err
+				}
+				certs = append(certs, &cert)
+			}
+			if strings.HasSuffix(f.Name(), ".key") {
+				keyName := f.Name()
+				certName := keyName[:len(keyName)-4] + ".cert"
+				log.Debugf("key: %s", hostDir+"/"+f.Name())
+				if !hasFile(fs, certName) {
+					return nil, nil, fmt.Errorf("Missing certificate %s for key %s", certName, keyName)
+				}
 			}
 		}
 	}
 
 	if len(certs) == 0 {
-		client := newClient(jar, pool, nil, timeout)
+		client := newClient(jar, pool, nil, timeout, secure)
 		res, err := client.Do(req)
 		if err != nil {
 			return nil, nil, err
 		}
 		return res, client, nil
 	}
+
 	for i, cert := range certs {
-		client := newClient(jar, pool, cert, timeout)
+		client := newClient(jar, pool, cert, timeout, secure)
 		res, err := client.Do(req)
 		// If this is the last cert, otherwise, continue to next cert if 403 or 5xx
 		if i == len(certs)-1 || err == nil &&
@@ -213,49 +225,6 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
 	return hostname, reposName, nil
 }
 
-// this method expands the registry name as used in the prefix of a repo
-// to a full url. if it already is a url, there will be no change.
-func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (string, error) {
-	if hostname == IndexServerAddress() {
-		return hostname, nil
-	}
-
-	endpoint := fmt.Sprintf("http://%s/v1/", hostname)
-
-	if secure {
-		endpoint = fmt.Sprintf("https://%s/v1/", hostname)
-	}
-
-	if _, oerr := pingRegistryEndpoint(endpoint); oerr != nil {
-		//TODO: triggering highland build can be done there without "failing"
-		err := fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, oerr)
-
-		if secure {
-			err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", oerr, hostname)
-		}
-
-		return "", err
-	}
-
-	return endpoint, nil
-}
-
-// this method verifies if the provided hostname is part of the list of
-// insecure registries and returns false if HTTP should be used
-func IsSecure(hostname string, insecureRegistries []string) bool {
-	if hostname == IndexServerAddress() {
-		return true
-	}
-
-	for _, h := range insecureRegistries {
-		if hostname == h {
-			return false
-		}
-	}
-
-	return true
-}
-
 func trustedLocation(req *http.Request) bool {
 	var (
 		trusteds = []string{"docker.com", "docker.io"}
diff --git a/registry/registry_test.go b/registry/registry_test.go
index fdf714e800..23aef6c361 100644
--- a/registry/registry_test.go
+++ b/registry/registry_test.go
@@ -21,7 +21,7 @@ const (
 
 func spawnTestRegistrySession(t *testing.T) *Session {
 	authConfig := &AuthConfig{}
-	endpoint, err := NewEndpoint(makeURL("/v1/"))
+	endpoint, err := NewEndpoint(makeURL("/v1/"), false)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -33,7 +33,7 @@ func spawnTestRegistrySession(t *testing.T) *Session {
 }
 
 func TestPingRegistryEndpoint(t *testing.T) {
-	ep, err := NewEndpoint(makeURL("/v1/"))
+	ep, err := NewEndpoint(makeURL("/v1/"), false)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/registry/service.go b/registry/service.go
index 890837ca5e..32274f407d 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -89,7 +89,10 @@ func (s *Service) Search(job *engine.Job) engine.Status {
 	if err != nil {
 		return job.Error(err)
 	}
-	endpoint, err := NewEndpoint(hostname)
+
+	secure := IsSecure(hostname, s.insecureRegistries)
+
+	endpoint, err := NewEndpoint(hostname, secure)
 	if err != nil {
 		return job.Error(err)
 	}
diff --git a/registry/session.go b/registry/session.go
index 8dbf136205..ba6df35841 100644
--- a/registry/session.go
+++ b/registry/session.go
@@ -65,7 +65,7 @@ func NewSession(authConfig *AuthConfig, factory *utils.HTTPRequestFactory, endpo
 }
 
 func (r *Session) doRequest(req *http.Request) (*http.Response, *http.Client, error) {
-	return doRequest(req, r.jar, r.timeout)
+	return doRequest(req, r.jar, r.timeout, r.indexEndpoint.secure)
 }
 
 // Retrieve the history of a given image from the Registry.

From e43d9f713e96daed521034995c00375544f62827 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Wed, 22 Oct 2014 08:30:48 -0400
Subject: [PATCH 6/9] Docs edits for dropping SSLv3 and under + release notes
 for 1.3.1

Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	docs/sources/index.md

Conflicts:
	docs/sources/index.md
---
 docs/mkdocs.yml                               |   1 +
 docs/sources/index.md                         |  61 +---
 .../reference/api/hub_registry_spec.md        |  30 +-
 docs/sources/reference/api/registry_api.md    |  29 +-
 docs/sources/reference/commandline/cli.md     |   7 +-
 docs/sources/release-notes.md                 | 291 ++++++++++++++++++
 6 files changed, 334 insertions(+), 85 deletions(-)
 mode change 100755 => 100644 docs/mkdocs.yml
 create mode 100644 docs/sources/release-notes.md

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
old mode 100755
new mode 100644
index 6e018f4afa..faa758546b
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -26,6 +26,7 @@ pages:
 
 # Introduction:
 - ['index.md', 'About', 'Docker']
+- ['release-notes.md', 'About', 'Release Notes']
 - ['introduction/index.md', '**HIDDEN**']
 - ['introduction/understanding-docker.md', 'About', 'Understanding Docker']
 
diff --git a/docs/sources/index.md b/docs/sources/index.md
index bcec387f6b..5780eab05d 100644
--- a/docs/sources/index.md
+++ b/docs/sources/index.md
@@ -88,63 +88,4 @@ implementation, check out the [Docker User Guide](/userguide/).
 
 ## Release Notes
 
-**Version 1.3.0**
-
-This version fixes a number of bugs and issues and adds new functions and other
-improvements. The [GitHub 1.3 milestone](https://github.com/docker/docker/issues?q=milestone%3A1.3.0+) has
-more detailed information. Major additions and changes include:
-
-*New command: `docker exec`*
-
-The new `docker exec` command lets you run a process in an existing, active
-container. The command has APIs for both the daemon and the client. With
-`docker exec`, you'll be able to do things like add or remove devices from
-running containers, debug running containers, and run commands that are not
-part of the container's static specification. Details in the [command line
-reference](/reference/commandline/cli/#exec).
-
-*New command: `docker create`*
-
-Traditionally, the `docker run` command has been used to both create a
-container and spawn a process to run it. The new `docker create` command breaks
-this apart, letting you set up a container without actually starting it. This
-provides more control over management of the container lifecycle, giving you the
-ability to configure things like volumes or port mappings before the container
-is started. For example, in a rapid-response scaling situation, you could use
-`create` to prepare and stage ten containers in anticipation of heavy loads.
-Details in the [command line reference](/reference/commandline/cli/#create).
-
-*Tech preview of new provenance features*
-
-This release offers a sneak peek at new image signing capabilities that are
-currently under development. Soon, these capabilities will allow any image
-author to sign their images to certify they have not been tampered with. For
-this release, Official images are now signed by Docker, Inc. Not only does this
-demonstrate the new functionality, we hope it will improve your confidence in
-the security of Official images. Look for the blue ribbons denoting signed
-images on the [Docker Hub](https://hub.docker.com/).
-The Docker Engine has been updated to automatically verify that a given
-Official Repo has a current, valid signature. When pulling a signed image,
-you'll see a message stating `the image you are pulling has been verified`. If
-no valid signature is detected, Docker Engine will fall back to pulling a
-regular, unsigned image.
-
-*Other improvements & changes*
-
-* We've added a new security options flag to the `docker run` command,
-`--security-opt`, that lets you set SELinux and AppArmor labels and profiles.
-This means you'll  no longer have to use `docker run --privileged` on kernels
-that support SE Linux or AppArmor. For more information, see the
-[command line reference](/reference/commandline/cli/#run).
-
-* A new flag, `--add-host`, has been added to `docker run` that lets you add
-lines to `/etc/hosts`. This allows you to specify different name
-resolution for the container than it would get via DNS. For more information,
-see the [command line reference](/reference/commandline/cli/#run).
-
-* You can now set a `DOCKER_TLS_VERIFY` environment variable to secure
-connections by default (rather than having to pass the `--tlsverify` flag on
-every call). For more information, see the [https guide](/articles/https).
-
-* Three security issues have been addressed in this release: [CVE-2014-5280,
-CVE-2014-5270, and CVE-2014-5282](https://groups.google.com/forum/#!msg/docker-announce/aQoVmQlcE0A/smPuBNYf8VwJ).
+A summary of the changes in each release in the current series can now be found on the separate [Release Notes page](/release-notes/)
diff --git a/docs/sources/reference/api/hub_registry_spec.md b/docs/sources/reference/api/hub_registry_spec.md
index ee15277a44..853eda4aee 100644
--- a/docs/sources/reference/api/hub_registry_spec.md
+++ b/docs/sources/reference/api/hub_registry_spec.md
@@ -4,7 +4,9 @@ page_keywords: docker, registry, api, hub
 
 # The Docker Hub and the Registry spec
 
-## The 3 roles
+## The three roles
+
+There are three major components playing a role in the Docker ecosystem.
 
 ### Docker Hub
 
@@ -21,13 +23,15 @@ The Docker Hub has different components:
  - Authentication service
  - Tokenization
 
-The Docker Hub is authoritative for those information.
+The Docker Hub is authoritative for that information.
 
-We expect that there will be only one instance of the Docker Hub, run and
+There is only one instance of the Docker Hub, run and
 managed by Docker Inc.
 
 ### Registry
 
+The registry has the following characteristics:
+
  - It stores the images and the graph for a set of repositories
  - It does not have user accounts data
  - It has no notion of user accounts or authorization
@@ -37,35 +41,35 @@ managed by Docker Inc.
  - It doesn't have a local database
  - [Source Code](https://github.com/docker/docker-registry)
 
-We expect that there will be multiple registries out there. To help to
+We expect that there will be multiple registries out there. To help you
 grasp the context, here are some examples of registries:
 
  - **sponsor registry**: such a registry is provided by a third-party
    hosting infrastructure as a convenience for their customers and the
-   docker community as a whole. Its costs are supported by the third
+   Docker community as a whole. Its costs are supported by the third
    party, but the management and operation of the registry are
-   supported by dotCloud. It features read/write access, and delegates
+   supported by Docker, Inc. It features read/write access, and delegates
    authentication and authorization to the Docker Hub.
  - **mirror registry**: such a registry is provided by a third-party
    hosting infrastructure but is targeted at their customers only. Some
    mechanism (unspecified to date) ensures that public images are
    pulled from a sponsor registry to the mirror registry, to make sure
-   that the customers of the third-party provider can “docker pull”
+   that the customers of the third-party provider can `docker pull`
    those images locally.
  - **vendor registry**: such a registry is provided by a software
-   vendor, who wants to distribute docker images. It would be operated
+   vendor who wants to distribute docker images. It would be operated
    and managed by the vendor. Only users authorized by the vendor would
    be able to get write access. Some images would be public (accessible
    for anyone), others private (accessible only for authorized users).
    Authentication and authorization would be delegated to the Docker Hub.
-   The goal of vendor registries is to let someone do “docker pull
-   basho/riak1.3” and automatically push from the vendor registry
-   (instead of a sponsor registry); i.e. get all the convenience of a
+   The goal of vendor registries is to let someone do `docker pull
+   basho/riak1.3` and automatically push from the vendor registry
+   (instead of a sponsor registry); i.e., vendors get all the convenience of a
    sponsor registry, while retaining control on the asset distribution.
  - **private registry**: such a registry is located behind a firewall,
    or protected by an additional security layer (HTTP authorization,
    SSL client-side certificates, IP address authorization...). The
-   registry is operated by a private entity, outside of dotCloud's
+   registry is operated by a private entity, outside of Docker's
    control. It can optionally delegate additional authorization to the
    Docker Hub, but it is not mandatory.
 
@@ -77,7 +81,7 @@ grasp the context, here are some examples of registries:
 > - local mount point;
 > - remote docker addressed through SSH.
 
-The latter would only require two new commands in docker, e.g.,
+The latter would only require two new commands in Docker, e.g.,
 `registryget` and `registryput`,
 wrapping access to the local filesystem (and optionally doing
 consistency checks). Authentication and authorization are then delegated
diff --git a/docs/sources/reference/api/registry_api.md b/docs/sources/reference/api/registry_api.md
index 8fe24cf6fb..0839fe209f 100644
--- a/docs/sources/reference/api/registry_api.md
+++ b/docs/sources/reference/api/registry_api.md
@@ -21,30 +21,30 @@ grasp the context, here are some examples of registries:
 
  - **sponsor registry**: such a registry is provided by a third-party
    hosting infrastructure as a convenience for their customers and the
-   docker community as a whole. Its costs are supported by the third
+   Docker community as a whole. Its costs are supported by the third
    party, but the management and operation of the registry are
-   supported by dotCloud. It features read/write access, and delegates
+   supported by Docker. It features read/write access, and delegates
    authentication and authorization to the Index.
  - **mirror registry**: such a registry is provided by a third-party
    hosting infrastructure but is targeted at their customers only. Some
    mechanism (unspecified to date) ensures that public images are
    pulled from a sponsor registry to the mirror registry, to make sure
-   that the customers of the third-party provider can “docker pull”
+   that the customers of the third-party provider can `docker pull`
    those images locally.
  - **vendor registry**: such a registry is provided by a software
-   vendor, who wants to distribute docker images. It would be operated
+   vendor, who wants to distribute Docker images. It would be operated
    and managed by the vendor. Only users authorized by the vendor would
    be able to get write access. Some images would be public (accessible
    for anyone), others private (accessible only for authorized users).
    Authentication and authorization would be delegated to the Index.
-   The goal of vendor registries is to let someone do “docker pull
-   basho/riak1.3” and automatically push from the vendor registry
-   (instead of a sponsor registry); i.e. get all the convenience of a
+   The goal of vendor registries is to let someone do `docker pull
+   basho/riak1.3` and automatically push from the vendor registry
+   (instead of a sponsor registry); i.e., get all the convenience of a
    sponsor registry, while retaining control on the asset distribution.
  - **private registry**: such a registry is located behind a firewall,
    or protected by an additional security layer (HTTP authorization,
    SSL client-side certificates, IP address authorization...). The
-   registry is operated by a private entity, outside of dotCloud's
+   registry is operated by a private entity, outside of Docker's
    control. It can optionally delegate additional authorization to the
    Index, but it is not mandatory.
 
@@ -52,7 +52,7 @@ grasp the context, here are some examples of registries:
 > Mirror registries and private registries which do not use the Index
 > don't even need to run the registry code. They can be implemented by any
 > kind of transport implementing HTTP GET and PUT. Read-only registries
-> can be powered by a simple static HTTP server.
+> can be powered by a simple static HTTPS server.
 
 > **Note**:
 > The latter implies that while HTTP is the protocol of choice for a registry,
@@ -60,13 +60,20 @@ grasp the context, here are some examples of registries:
 >
 >  - HTTP with GET (and PUT for read-write registries);
 >  - local mount point;
->  - remote docker addressed through SSH.
+>  - remote Docker addressed through SSH.
 
-The latter would only require two new commands in docker, e.g.,
+The latter would only require two new commands in Docker, e.g.,
 `registryget` and `registryput`, wrapping access to the local filesystem
 (and optionally doing consistency checks). Authentication and authorization
 are then delegated to SSH (e.g., with public keys).
 
+> **Note**:
+> Private registry servers that expose an HTTP endpoint need to be secured with
+> TLS (preferably TLSv1.2, but at least TLSv1.0). Make sure to put the CA
+> certificate at /etc/docker/certs.d/my.registry.com:5000/ca.crt on the Docker
+> host, so that the daemon can securely access the private registry.
+> Support for SSLv3 and lower is not available due to security issues.
+
 The default namespace for a private repository is `library`.
 
 # Endpoints
diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md
index 1d4202811d..8a158d7334 100644
--- a/docs/sources/reference/commandline/cli.md
+++ b/docs/sources/reference/commandline/cli.md
@@ -112,7 +112,12 @@ direct access to the Docker daemon - and should be secured either using the
 [built in https encrypted socket](/articles/https/), or by putting a secure web
 proxy in front of it. You can listen on port `2375` on all network interfaces
 with `-H tcp://0.0.0.0:2375`, or on a particular network interface using its IP
-address: `-H tcp://192.168.59.103:2375`.
+address: `-H tcp://192.168.59.103:2375`. It is conventional to use port `2375`
+for un-encrypted, and port `2376` for encrypted communication with the daemon.
+
+> **Note** If you're using an HTTPS encrypted socket, keep in mind that only TLS1.0
+> and greater are supported. Protocols SSLv3 and under are not supported anymore
+> for security reasons.
 
 On Systemd based systems, you can communicate with the daemon via 
 [systemd socket activation](http://0pointer.de/blog/projects/socket-activation.html), use
diff --git a/docs/sources/release-notes.md b/docs/sources/release-notes.md
new file mode 100644
index 0000000000..6b2f0fd571
--- /dev/null
+++ b/docs/sources/release-notes.md
@@ -0,0 +1,291 @@
+page_title: Docker 1.x Series Release Notes page_description: Release Notes for
+Docker 1.x. page_keywords: docker, documentation, about, technology,
+understanding, release
+
+#Release Notes
+
+##Version 1.3.1
+(2014-10-28)
+
+This release fixes some bugs and addresses some security issues.
+
+*Security fixes*
+
+Patches and changes were made to address CVE-2014-5277 and CVE-2014-3566. Specifically, changes were made to:
+* Prevent fallback to SSL protocols < TLS 1.0 for client, daemon and registry
+* Secure HTTPS connection to registries with certificate verification and without HTTP fallback unless `--insecure-registry` is specified.
+
+*Runtime fixes*
+
+* Fixed issue where volumes would not be shared
+
+*Client fixes*
+
+* Fixed issue with `--iptables=false` not automatically setting
+`--ip-masq=false`
+* Fixed docker run output to non-TTY stdout
+
+*Builder fixes*
+
+* Fixed escaping `$` for environment variables
+* Fixed issue with lowercase `onbuild` Dockerfile instruction
+
+
+##Version 1.3.0
+
+This version fixes a number of bugs and issues and adds new functions and other
+improvements. The [GitHub 1.3milestone](https://github.com/docker/docker/issues?q=milestone%3A1.3.0+) has
+more detailed information. Major additions and changes include:
+
+###New Features
+
+*New command: `docker exec`*
+
+The new `docker exec` command lets you run a process in an existing, active
+container. The command has APIs for both the daemon and the client. With `docker
+exec`, you'll be able to do things like add or remove devices from running
+containers, debug running containers, and run commands that are not part of the
+container's static specification. Details in the [command line reference](/reference/commandline/cli/#exec).
+
+*New command: `docker create`*
+
+Traditionally, the `docker run` command has been used to both create a container
+and spawn a process to run it. The new `docker create` command breaks this
+apart, letting you set up a container without actually starting it. This
+provides more control over management of the container lifecycle, giving you the
+ability to configure things like volumes or port mappings before the container
+is started. For example, in a rapid-response scaling situation, you could use
+`create` to prepare and stage ten containers in anticipation of heavy loads.
+Details in the [command line reference](/reference/commandline/cli/#create).
+
+*Tech preview of new provenance features*
+
+This release offers a sneak peek at new image signing capabilities that are
+currently under development. Soon, these capabilities will allow any image
+author to sign their images to certify they have not been tampered with. For
+this release, Official images are now signed by Docker, Inc. Not only does this
+demonstrate the new functionality, we hope it will improve your confidence in
+the security of Official images. Look for the blue ribbons denoting signed
+images on the [Docker Hub](https://hub.docker.com/). The Docker Engine has been
+updated to automatically verify that a given Official Repo has a current, valid
+signature. When pulling a signed image, you'll see a message stating `the image
+you are pulling has been verified`. If no valid signature is detected, Docker
+Engine will fall back to pulling a regular, unsigned image.
+
+###Other improvements & changes*
+
+* We've added a new security options flag to the `docker run` command,
+`--security-opt`, that lets you set SELinux and AppArmor labels and profiles.
+This means you'll  no longer have to use `docker run --privileged` on kernels
+that support SE Linux or AppArmor. For more information, see the [command line
+reference](/reference/commandline/cli/#run).
+
+* A new flag, `--add-host`, has been added to `docker run` that lets you add
+lines to `/etc/hosts`. This allows you to specify different name resolution for
+the container than it would get via DNS. For more information, see the [command
+line reference](/reference/commandline/cli/#run).
+
+* You can now set a `DOCKER_TLS_VERIFY` environment variable to secure
+connections by default (rather than having to pass the `--tlsverify` flag on
+every call). For more information, see the [https guide](/articles/https).
+
+* Three security issues have been addressed in this release: [CVE-2014-5280,
+CVE-2014-5270, and
+CVE-2014-5282](https://groups.google.com/forum/#!msg/docker-announce/aQoVmQlcE0A/smPuBNYf8VwJ).
+
+##Version 1.2.0
+
+This version fixes a number of bugs and issues and adds new functions and other
+improvements. These include:
+
+###New Features
+
+*New restart policies*
+
+We added a `--restart flag` to `docker run` to specify a restart policy for your
+container. Currently, there are three policies available:
+
+* `no` – Do not restart the container if it dies. (default) * `on-failure` –
+Restart the container if it exits with a non-zero exit code. This can also
+accept an optional maximum restart count (e.g. `on-failure:5`). * `always` –
+Always restart the container no matter what exit code is returned. This
+deprecates the `--restart` flag on the Docker daemon.
+
+*New flags for `docker run`: `--cap-add` and `–-cap-drop`*
+
+In previous releases, Docker containers could either be given complete
+capabilities or they could all follow a whitelist of allowed capabilities while
+dropping all others. Further, using `--privileged` would grant all capabilities
+inside a container, rather than applying a whitelist. This was not recommended
+for production use because it’s really unsafe; it’s as if you were directly in
+the host.
+
+This release introduces two new flags for `docker run`, `--cap-add` and
+`--cap-drop`, that give you fine-grain control over the specific capabilities
+you want grant to a particular container.
+
+*New `-–device` flag for `docker run`*
+
+Previously, you could only use devices inside your containers by bind mounting
+them (with `-v`) in a `--privileged` container. With this release, we introduce
+the `--device flag` to `docker run` which lets you use a device without
+requiring a privileged container.
+
+*Writable `/etc/hosts`, `/etc/hostname` and `/etc/resolv.conf`*
+
+You can now edit `/etc/hosts`, `/etc/hostname` and `/etc/resolve.conf` in a
+running container. This is useful if you need to install BIND or other services
+that might override one of those files.
+
+Note, however, that changes to these files are not saved when running `docker
+build` and so will not be preserved in the resulting image. The changes will
+only “stick” in a running container.
+
+*Docker proxy in a separate process*
+
+The Docker userland proxy that routes outbound traffic to your containers now
+has its own separate process (one process per connection). This greatly reduces
+the load on the daemon, which increases stability and efficiency.
+
+###Other improvements & changes
+
+* When using `docker rm -f`, Docker now kills the container (instead of stopping
+it) before removing it . If you intend to stop the container cleanly, you can
+use `docker stop`.
+
+* Added support for IPv6 addresses in `--dns`
+
+* Added search capability in private registries
+
+##Version 1.1.0
+
+###New Features
+
+*`.dockerignore` support*
+
+You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will
+ignore files and directories specified in that file when sending the build
+context to the daemon. Example:
+https://github.com/docker/docker/blob/master/.dockerignore
+
+*Pause containers during commit*
+
+Doing a commit on a running container was not recommended because you could end
+up with files in an inconsistent state (for example, if they were being written
+during the commit). Containers are now paused when a commit is made to them. You
+can disable this feature by doing a `docker commit --pause=false <container_id>`
+
+*Tailing logs*
+
+You can now tail the logs of a container. For example, you can get the last ten
+lines of a log by using `docker logs --tail 10 <container_id>`. You can also
+follow the logs of a container without having to read the whole log file with
+`docker logs --tail 0 -f <container_id>`.
+
+*Allow a tar file as context for docker build*
+
+You can now pass a tar archive to `docker build` as context. This can be used to
+automate docker builds, for example: `cat context.tar | docker build -` or
+`docker run builder_image | docker build -`
+
+*Bind mounting your whole filesystem in a container*
+
+`/` is now allowed as source of `--volumes`. This means you can bind-mount your
+whole system in a container if you need to. For example: `docker run -v
+/:/my_host ubuntu:ro ls /my_host`. However, it is now forbidden to mount to /.
+
+
+###Other Improvements & Changes
+
+* Port allocation has been improved. In the previous release, Docker could
+prevent you from starting a container with previously allocated ports which
+seemed to be in use when in fact they were not. This has been fixed.
+
+* A bug in `docker save` was introduced in the last release. The `docker save`
+command could produce images with invalid metadata. The command now produces
+images with correct metadata.
+
+* Running `docker inspect` in a container now returns which containers it is
+linked to.
+
+* Parsing of the `docker commit` flag has improved validation, to better prevent
+you from committing an image with a name such as  `-m`. Image names with dashes
+in them potentially conflict with command line flags.
+
+* The API now has Improved status codes for  `start` and `stop`. Trying to start
+a running container will now return a 304 error.
+
+* Performance has been improved overall. Starting the daemon is faster than in
+previous releases. The daemon’s performance has also been improved when it is
+working with large numbers of images and containers.
+
+* Fixed an issue with white-spaces and multi-lines in Dockerfiles.
+
+##Version 1.1.0
+
+###New Features
+
+*`.dockerignore` support*
+
+You can now add a `.dockerignore` file next to your `Dockerfile` and Docker will
+ignore files and directories specified in that file when sending the build
+context to the daemon. Example:
+https://github.com/dotcloud/docker/blob/master/.dockerignore
+
+*Pause containers during commit*
+
+Doing a commit on a running container was not recommended because you could end
+up with files in an inconsistent state (for example, if they were being written
+during the commit). Containers are now paused when a commit is made to them. You
+can disable this feature by doing a `docker commit --pause=false <container_id>`
+
+*Tailing logs*
+
+You can now tail the logs of a container. For example, you can get the last ten
+lines of a log by using `docker logs --tail 10 <container_id>`. You can also
+follow the logs of a container without having to read the whole log file with
+`docker logs --tail 0 -f <container_id>`.
+
+*Allow a tar file as context for docker build*
+
+You can now pass a tar archive to `docker build` as context. This can be used to
+automate docker builds, for example: `cat context.tar | docker build -` or
+`docker run builder_image | docker build -`
+
+*Bind mounting your whole filesystem in a container*
+
+`/` is now allowed as source of `--volumes`. This means you can bind-mount your
+whole system in a container if you need to. For example: `docker run -v
+/:/my_host ubuntu:ro ls /my_host`. However, it is now forbidden to mount to /.
+
+
+###Other Improvements & Changes
+
+* Port allocation has been improved. In the previous release, Docker could
+prevent you from starting a container with previously allocated ports which
+seemed to be in use when in fact they were not. This has been fixed.
+
+* A bug in `docker save` was introduced in the last release. The `docker save`
+command could produce images with invalid metadata. The command now produces
+images with correct metadata.
+
+* Running `docker inspect` in a container now returns which containers it is
+linked to.
+
+* Parsing of the `docker commit` flag has improved validation, to better prevent
+you from committing an image with a name such as  `-m`. Image names with dashes
+in them potentially conflict with command line flags.
+
+* The API now has Improved status codes for  `start` and `stop`. Trying to start
+a running container will now return a 304 error.
+
+* Performance has been improved overall. Starting the daemon is faster than in
+previous releases. The daemon’s performance has also been improved when it is
+working with large numbers of images and containers.
+
+* Fixed an issue with white-spaces and multi-lines in Dockerfiles.
+
+##Version 1.0.0
+
+First production-ready release. Prior development history can be found by
+searching in [GitHub](https://github.com/docker/docker).

From 05c18a2434ab7bd68a86c87fe866bc7107ac1941 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Tue, 28 Oct 2014 21:20:30 -0400
Subject: [PATCH 7/9] Fix login command

Signed-off-by: Tibor Vass <teabee89@gmail.com>
---
 registry/service.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/registry/service.go b/registry/service.go
index 32274f407d..7051d93430 100644
--- a/registry/service.go
+++ b/registry/service.go
@@ -50,9 +50,11 @@ func (s *Service) Auth(job *engine.Job) engine.Status {
 		authConfig.ServerAddress = endpoint.String()
 	}
 
-	if _, err := Login(authConfig, HTTPRequestFactory(nil)); err != nil {
+	status, err := Login(authConfig, HTTPRequestFactory(nil))
+	if err != nil {
 		return job.Error(err)
 	}
+	job.Printf("%s\n", status)
 
 	return engine.StatusOK
 }

From 4a17e6eeddee1fe13c7aa5ad7f6a789490add0fe Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Mon, 20 Oct 2014 19:17:32 -0400
Subject: [PATCH 8/9] Bump to version v1.3.1

Signed-off-by: Tibor Vass <teabee89@gmail.com>

Conflicts:
	VERSION
---
 CHANGELOG.md | 18 ++++++++++++++++++
 VERSION      |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c5218eea2..f958bbd48c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.3.1 (2014-10-28)
+
+#### Security
+* Prevent fallback to SSL protocols < TLS 1.0 for client, daemon and registry
++ Secure HTTPS connection to registries with certificate verification and without HTTP fallback unless `--insecure-registry` is specified
+
+#### Runtime
+- Fix issue where volumes would not be shared
+
+#### Client
+- Fix issue with `--iptables=false` not automatically setting `--ip-masq=false`
+- Fix docker run output to non-TTY stdout
+
+#### Builder
+- Fix escaping `$` for environment variables
+- Fix issue with lowercase `onbuild` Dockerfile instruction
+- Restrict envrionment variable expansion to `ENV`, `ADD`, `COPY`, `WORKDIR`, `EXPOSE`, `VOLUME` and `USER`
+
 ## 1.3.0 (2014-10-14)
 
 #### Notable features since 1.2.0
diff --git a/VERSION b/VERSION
index b6bb93f7c7..3a3cd8cc8b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0-dev
+1.3.1

From b9fcdb81917f2258b295a14398054b40bb6919b8 Mon Sep 17 00:00:00 2001
From: Tibor Vass <teabee89@gmail.com>
Date: Thu, 30 Oct 2014 19:45:07 -0400
Subject: [PATCH 9/9] Change version to 1.3.1-dev

Signed-off-by: Tibor Vass <teabee89@gmail.com>
---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 3a3cd8cc8b..625610ece8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.1
+1.3.1-dev