|
 |
97f2a8 |
commit 4146cc61a6bd0a26f3b58db9be5b167006dd110c
|
|
|
97f2a8 |
Author: Dan Walsh <dwalsh@redhat.com>
|
|
|
97f2a8 |
Date: Fri Mar 27 10:22:48 2015
|
|
|
97f2a8 |
|
|
|
97f2a8 |
Do not fallback to HTTP unless registry is insecure
|
|
|
97f2a8 |
|
|
|
97f2a8 |
Do not consider additional registries as insecure. Refuse to fallback to
|
|
|
97f2a8 |
HTTP unless additional registry is also passed with
|
|
|
97f2a8 |
`--insecure-registry` flag.
|
|
|
97f2a8 |
|
|
|
97f2a8 |
Signed-off-by: Michal Minar <miminar@redhat.com>
|
|
|
97f2a8 |
|
|
|
97f2a8 |
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
|
|
|
97f2a8 |
|
|
|
97f2a8 |
diff --git a/registry/config.go b/registry/config.go
|
|
|
97f2a8 |
index 7cf8e77..5aae180 100644
|
|
|
97f2a8 |
--- a/registry/config.go
|
|
|
97f2a8 |
+++ b/registry/config.go
|
|
|
97f2a8 |
@@ -161,7 +161,7 @@ func NewServiceConfig(options *Options) *ServiceConfig {
|
|
|
97f2a8 |
config.IndexConfigs[r] = &IndexInfo{
|
|
|
97f2a8 |
Name: r,
|
|
|
97f2a8 |
Mirrors: mirrors,
|
|
|
97f2a8 |
- Secure: r == INDEXNAME,
|
|
|
97f2a8 |
+ Secure: true,
|
|
|
97f2a8 |
Official: r == INDEXNAME,
|
|
|
97f2a8 |
}
|
|
|
97f2a8 |
}
|