From d859bcf5f30bbe1ed73a8cf8e58890163a2db79f Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 4 Feb 2015 09:21:36 -0800 Subject: [PATCH] Limit push and pull to v2 official registry No longer push to the official v2 registry when it is available. This allows pulling images from the v2 registry without defaulting push. Only pull official images from the v2 official registry. Signed-off-by: Derek McGowan (github: dmcgowan) Upstream-commit: 88fdcfef02cdc8b4fcff10cded6a89a42a360ec1 Component: engine --- components/engine/graph/pull.go | 2 +- components/engine/graph/push.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/graph/pull.go b/components/engine/graph/pull.go index df00bc868e..fd6170b571 100644 --- a/components/engine/graph/pull.go +++ b/components/engine/graph/pull.go @@ -72,7 +72,7 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status { logName += ":" + tag } - if len(repoInfo.Index.Mirrors) == 0 && (repoInfo.Index.Official || endpoint.Version == registry.APIVersion2) { + if len(repoInfo.Index.Mirrors) == 0 && ((repoInfo.Official && repoInfo.Index.Official) || endpoint.Version == registry.APIVersion2) { j := job.Eng.Job("trust_update_base") if err = j.Run(); err != nil { log.Errorf("error updating trust base graph: %s", err) diff --git a/components/engine/graph/push.go b/components/engine/graph/push.go index ff699ee4b8..6ae2d670d6 100644 --- a/components/engine/graph/push.go +++ b/components/engine/graph/push.go @@ -455,7 +455,7 @@ func (s *TagStore) CmdPush(job *engine.Job) engine.Status { return job.Error(err2) } - if repoInfo.Index.Official || endpoint.Version == registry.APIVersion2 { + if endpoint.Version == registry.APIVersion2 { err := s.pushV2Repository(r, job.Eng, job.Stdout, repoInfo, tag, sf) if err == nil { return engine.StatusOK