Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix return of error adding artifacts to cache when images are built remotely #4850

Merged
merged 3 commits into from
Oct 2, 2020
Merged

Fix return of error adding artifacts to cache when images are built remotely #4850

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cf3add
Fix return of error when images are built remotely
ricardo-larosa Oct 2, 2020
c2fff56
Remove unnecessary leading newline
ricardo-larosa Oct 2, 2020
834d6a8
Simplify func addArtifacts
ricardo-larosa Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions pkg/skaffold/build/cache/retrieve.go
View file
Open in desktop
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 {
ricardo-larosa marked this conversation as resolved.
Show resolved Hide resolved
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
}