Skip to content

Commit

Permalink
Fix return of error adding artifacts to cache when images are built r…
Browse files Browse the repository at this point in the history
…emotely (#4850)

* Fix return of error when images are built remotely

* Remove unnecessary leading newline

* Simplify func addArtifacts
  • Loading branch information
ricardo-larosa authored Oct 2, 2020
1 parent 1e33557 commit 3c10069
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions pkg/skaffold/build/cache/retrieve.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,29 +149,25 @@ func maintainArtifactOrder(built []build.Artifact, artifacts []*latest.Artifact)
func (c *cache) addArtifacts(ctx context.Context, bRes []build.Artifact, hashByName map[string]string) error {
for _, a := range bRes {
entry := ImageDetails{}
if c.imagesAreLocal {
imageID, err := c.client.ImageID(ctx, a.Tag)
if err != nil {
return err
}

if !c.imagesAreLocal {
if imageID != "" {
entry.ID = imageID
}
} else {
ref, err := docker.ParseReference(a.Tag)
if err != nil {
return fmt.Errorf("parsing reference %q: %w", a.Tag, err)
}

entry.Digest = ref.Digest
}

imageID, err := c.client.ImageID(ctx, a.Tag)
if err != nil {
return err
}

if imageID != "" {
entry.ID = imageID
}

c.cacheMutex.Lock()
c.artifactCache[hashByName[a.ImageName]] = entry
c.cacheMutex.Unlock()
}

return nil
}

0 comments on commit 3c10069

Please sign in to comment.