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 <derek@mcgstyle.net> (github: dmcgowan)
diff --git a/graph/pull.go b/graph/pull.go
index df00bc8..fd6170b 100644
--- a/graph/pull.go
+++ b/graph/pull.go
@@ -72,7 +72,7 @@
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/graph/push.go b/graph/push.go
index d9bb121..5d0d24e 100644
--- a/graph/push.go
+++ b/graph/push.go
@@ -455,7 +455,7 @@
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
