docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from infosiftr/containerd-canonical 

Correctly store "canonical" image refs in containerd's image store
This commit is contained in:
Tianon Gravi 2023-02-22 16:44:02 -08:00 committed by GitHub
parent c42713594f 419bd042db
commit d7cd73aca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/bashbrew/oci-builder.go
View File

@ -180,8 +180,12 @@ func ociImportBuild(tags []string, commit, dir, file string) error {
is := client.ImageService() is := client.ImageService()
for _, tag := range tags { for _, tag := range tags {
ref, err := docker.ParseAnyReference(tag)
if err != nil {
return fmt.Errorf("failed to parse tag %q while updating image in containerd: %w", tag, err)
}
img := images.Image{ img := images.Image{
Name: tag, Name: ref.String(),
Target: manifestDescriptor, Target: manifestDescriptor,
} }
img2, err := is.Update(ctx, img, "target") // "target" here is to specify that we want to update the descriptor that "Name" points to (if this image name already exists) img2, err := is.Update(ctx, img, "target") // "target" here is to specify that we want to update the descriptor that "Name" points to (if this image name already exists)
@ -216,7 +220,11 @@ func ociImportDockerLoad(tags []string) error {
archive.WithAllPlatforms(), archive.WithAllPlatforms(),
} }
for _, tag := range tags { for _, tag := range tags {
exportOpts = append(exportOpts, archive.WithImage(is, tag)) ref, err := docker.ParseAnyReference(tag)
if err != nil {
return fmt.Errorf("failed to parse tag %q while loading containerd image into Docker: %w", tag, err)
}
exportOpts = append(exportOpts, archive.WithImage(is, ref.String()))
} }
dockerLoad := exec.Command("docker", "load") dockerLoad := exec.Command("docker", "load")
@ -260,7 +268,12 @@ func ociImportLookup(tag string) (*imagespec.Descriptor, error) {
is := client.ImageService() is := client.ImageService()
img, err := is.Get(ctx, tag) ref, err := docker.ParseAnyReference(tag)
if err != nil {
return nil, fmt.Errorf("failed to parse tag %q while looking up containerd ref: %w", tag, err)
}
img, err := is.Get(ctx, ref.String())
if err != nil { if err != nil {
return nil, err return nil, err
} }