daemon/containerd: getPushDescriptor: fix formatting of platform in errors

thaJeztah · thaJeztah · commit ad2426213e01 · 2024-10-10T18:28:00.000+02:00
The platform was printed in its raw format, which didn't produce a very
readable output;

Before this change:

    $ docker image save --platform=linux/amd64 -o alpine_amd64.tar alpine:latest
    Error response from daemon: no suitable export target found for platform linux/amd64: no suitable image manifest found for platform {amd64 linux  [] }

After this change:

    $ docker image save --platform=linux/amd64 -o alpine_amd64.tar alpine:latest
    Error response from daemon: no suitable export target found for platform linux/amd64: no suitable image manifest found for platform linux/amd64

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/containerd/image_push.go b/daemon/containerd/image_push.go
@@ -261,7 +261,7 @@ func (i *ImageService) getPushDescriptor(ctx context.Context, img containerdimag
 
 	switch len(presentMatchingManifests) {
 	case 0:
-		return ocispec.Descriptor{}, errdefs.NotFound(fmt.Errorf("no suitable image manifest found for platform %s", *platform))
+		return ocispec.Descriptor{}, errdefs.NotFound(fmt.Errorf("no suitable image manifest found for platform %s", platforms.FormatAll(*platform)))
 	case 1:
 		// Only one manifest is available AND matching the requested platform.
 
@@ -293,7 +293,7 @@ func (i *ImageService) getPushDescriptor(ctx context.Context, img containerdimag
 			return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple matching manifests found but no specific platform requested"))
 		}
 
-		return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple manifests found for platform %s", *platform))
+		return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple manifests found for platform %s", platforms.FormatAll(*platform)))
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func (i *ImageService) getPushDescriptor(ctx context.Context, img containerdimag`
`261`	`261`
`262`	`262`	`switch len(presentMatchingManifests) {`
`263`	`263`	`case 0:`
`264`		`- return ocispec.Descriptor{}, errdefs.NotFound(fmt.Errorf("no suitable image manifest found for platform %s", *platform))`
	`264`	`+ return ocispec.Descriptor{}, errdefs.NotFound(fmt.Errorf("no suitable image manifest found for platform %s", platforms.FormatAll(*platform)))`
`265`	`265`	`case 1:`
`266`	`266`	`// Only one manifest is available AND matching the requested platform.`
`267`	`267`
`@@ -293,7 +293,7 @@ func (i *ImageService) getPushDescriptor(ctx context.Context, img containerdimag`
`293`	`293`	`return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple matching manifests found but no specific platform requested"))`
`294`	`294`	`}`
`295`	`295`
`296`		`- return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple manifests found for platform %s", *platform))`
	`296`	`+ return ocispec.Descriptor{}, errdefs.Conflict(errors.Errorf("multiple manifests found for platform %s", platforms.FormatAll(*platform)))`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`