Browse code

Enable V2 pull flow

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)

Derek McGowan authored on 2014/10/08 03:00:17
Showing 1 changed files
... ...
@@ -137,6 +137,19 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status {
137 137
 		mirrors = s.mirrors
138 138
 	}
139 139
 
140
+	if isOfficial || endpoint.Version == registry.APIVersion2 {
141
+		j := job.Eng.Job("trust_update_base")
142
+		if err = j.Run(); err != nil {
143
+			return job.Errorf("error updating trust base graph: %s", err)
144
+		}
145
+
146
+		if err := s.pullV2Repository(job.Eng, r, job.Stdout, localName, remoteName, tag, sf, job.GetenvBool("parallel")); err == nil {
147
+			return engine.StatusOK
148
+		} else if err != registry.ErrDoesNotExist {
149
+			log.Errorf("Error from V2 registry: %s", err)
150
+		}
151
+	}
152
+
140 153
 	if err = s.pullRepository(r, job.Stdout, localName, remoteName, tag, sf, job.GetenvBool("parallel"), mirrors); err != nil {
141 154
 		return job.Error(err)
142 155
 	}