diff --git a/daemon/reload.go b/daemon/reload.go index 20f1b8eacf..a5bef62712 100644 --- a/daemon/reload.go +++ b/daemon/reload.go @@ -63,10 +63,10 @@ func (daemon *Daemon) Reload(conf *config.Config) (err error) { if err := daemon.reloadAllowNondistributableArtifacts(conf, attributes); err != nil { return err } - if err := daemon.reloadInsecureRegistries(conf, attributes); err != nil { + if err := daemon.reloadRegistryMirrors(conf, attributes); err != nil { return err } - if err := daemon.reloadRegistryMirrors(conf, attributes); err != nil { + if err := daemon.reloadInsecureRegistries(conf, attributes); err != nil { return err } if err := daemon.reloadLiveRestore(conf, attributes); err != nil { diff --git a/daemon/reload_test.go b/daemon/reload_test.go index 0d72f1dd4c..5e35bbad47 100644 --- a/daemon/reload_test.go +++ b/daemon/reload_test.go @@ -238,13 +238,19 @@ func TestDaemonReloadInsecureRegistries(t *testing.T) { "docker3.example.com", // this will be newly added } + mirrors := []string{ + "https://mirror.test.example.com", + } + valuesSets := make(map[string]interface{}) valuesSets["insecure-registries"] = insecureRegistries + valuesSets["registry-mirrors"] = mirrors newConfig := &config.Config{ CommonConfig: config.CommonConfig{ ServiceOptions: registry.ServiceOptions{ InsecureRegistries: insecureRegistries, + Mirrors: mirrors, }, ValuesSet: valuesSets, },