Skip to content

daemon/containerd: fix compat for "docker run" with image that's not present #122

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

Merged
thaJeztah merged 1 commit into from
Dec 9, 2022
Merged

daemon/containerd: fix compat for "docker run" with image that's not present #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion daemon/containerd/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,13 @@ func (i *ImageService) resolveImage(ctx context.Context, refOrID string, platfor
if !cerrdefs.IsNotFound(err) {
return containerdimages.Image{}, err
}
return containerdimages.Image{}, errdefs.NotFound(errors.New("id not found"))
// Some clients (such as the docker 17.03 CLI used in CI) still
// perform string-matching to detect that the *image* wasn't found.
// This requires the error to be prefixed with "No such image:".
// Without this prefix, the CLI prints the error message, and exits.
//
// FIXME(thaJeztah): we need to fix this; if needed, gated by API version (API < X add the prefix)
return containerdimages.Image{}, errdefs.NotFound(errors.New("No such image: " + refOrID))
}
if platform != nil {
cs := i.client.ContentStore()
Expand Down