clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor IsSecure change

Browse Source 
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
This commit is contained in:
Michael Crosby
2014-10-30 19:41:55 -04:00
committed by Tibor Vass
parent 380c8320a7
commit f29b2e48eb
4 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/pull.go
+1 -1
View File
@@ -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 {