Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
| ... | ... |
@@ -79,22 +79,23 @@ func (s *TagStore) CmdPull(job *engine.Job) engine.Status {
|
| 79 | 79 |
if len(repoInfo.Index.Mirrors) == 0 && (repoInfo.Index.Official || endpoint.Version == registry.APIVersion2) {
|
| 80 | 80 |
j := job.Eng.Job("trust_update_base")
|
| 81 | 81 |
if err = j.Run(); err != nil {
|
| 82 |
- return job.Errorf("error updating trust base graph: %s", err)
|
|
| 82 |
+ log.Errorf("error updating trust base graph: %s", err)
|
|
| 83 | 83 |
} |
| 84 | 84 |
|
| 85 | 85 |
auth, err := r.GetV2Authorization(repoInfo.RemoteName, true) |
| 86 | 86 |
if err != nil {
|
| 87 |
- return job.Errorf("error getting authorization: %s", err)
|
|
| 88 |
- } |
|
| 87 |
+ log.Errorf("error getting authorization: %s", err)
|
|
| 88 |
+ } else {
|
|
| 89 | 89 |
|
| 90 |
- log.Debugf("pulling v2 repository with local name %q", repoInfo.LocalName)
|
|
| 91 |
- if err := s.pullV2Repository(job.Eng, r, job.Stdout, repoInfo, tag, sf, job.GetenvBool("parallel"), auth); err == nil {
|
|
| 92 |
- if err = job.Eng.Job("log", "pull", logName, "").Run(); err != nil {
|
|
| 93 |
- log.Errorf("Error logging event 'pull' for %s: %s", logName, err)
|
|
| 90 |
+ log.Debugf("pulling v2 repository with local name %q", repoInfo.LocalName)
|
|
| 91 |
+ if err := s.pullV2Repository(job.Eng, r, job.Stdout, repoInfo, tag, sf, job.GetenvBool("parallel"), auth); err == nil {
|
|
| 92 |
+ if err = job.Eng.Job("log", "pull", logName, "").Run(); err != nil {
|
|
| 93 |
+ log.Errorf("Error logging event 'pull' for %s: %s", logName, err)
|
|
| 94 |
+ } |
|
| 95 |
+ return engine.StatusOK |
|
| 96 |
+ } else if err != registry.ErrDoesNotExist {
|
|
| 97 |
+ log.Errorf("Error from V2 registry: %s", err)
|
|
| 94 | 98 |
} |
| 95 |
- return engine.StatusOK |
|
| 96 |
- } else if err != registry.ErrDoesNotExist {
|
|
| 97 |
- log.Errorf("Error from V2 registry: %s", err)
|
|
| 98 | 99 |
} |
| 99 | 100 |
|
| 100 | 101 |
log.Debug("image does not exist on v2 registry, falling back to v1")
|