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

Jump to bottom

Review nits from #257 #270

Merged
merged 2 commits into from
Jul 7, 2022
Merged

Review nits from #257 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f170b
Reenable tmpdir clean up
puerco Jul 7, 2022
906a076
OCI: Dont return semi built index on errors
puerco Jul 7, 2022
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
2 changes: 1 addition & 1 deletion internal/cli/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func PublishCmd(ctx context.Context, outputRefs string, archs []types.Architectu
// The build context options is sometimes copied in the next functions. Ensure
// we have the directory defined and created by invoking the function early.
bc.Options.TempDir()
// defer os.RemoveAll(bc.Options.TempDir())
defer os.RemoveAll(bc.Options.TempDir())

bc.Logger().Printf("building tags %v", bc.Options.Tags)

Expand Down
10 changes: 5 additions & 5 deletions pkg/build/oci/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,17 +352,17 @@ func publishIndexWithMediaType(mediaType ggcrtypes.MediaType, imgs map[types.Arc
img := imgs[arch]
mt, err := img.MediaType()
if err != nil {
return name.Digest{}, idx, fmt.Errorf("failed to get mediatype: %w", err)
return name.Digest{}, nil, fmt.Errorf("failed to get mediatype: %w", err)
}

h, err := img.Digest()
if err != nil {
return name.Digest{}, idx, fmt.Errorf("failed to compute digest: %w", err)
return name.Digest{}, nil, fmt.Errorf("failed to compute digest: %w", err)
}

size, err := img.Size()
if err != nil {
return name.Digest{}, idx, fmt.Errorf("failed to compute size: %w", err)
return name.Digest{}, nil, fmt.Errorf("failed to compute size: %w", err)
}

idx = ocimutate.AppendManifests(idx, ocimutate.IndexAddendum{
Expand All @@ -378,15 +378,15 @@ func publishIndexWithMediaType(mediaType ggcrtypes.MediaType, imgs map[types.Arc

h, err := idx.Digest()
if err != nil {
return name.Digest{}, idx, err
return name.Digest{}, nil, err
}

digest := name.Digest{}
for _, tag := range tags {
logger.Printf("publishing tag %v", tag)
digest, err = publishTagFromIndex(idx, tag, h, logger)
if err != nil {
return name.Digest{}, idx, err
return name.Digest{}, nil, err
}
}

Expand Down