beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45561 from laurazard/fix-pull-platform

Browse source 
fix: `docker pull` with platform checks wrong image tag
This commit is contained in:
Bjorn Neergaard 2023-05-18 14:14:12 +01:00 committed by GitHub
commit b42c65d796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/images/image_pull.go
View file

@ -63,7 +63,7 @@ func (i *ImageService) PullImage(ctx context.Context, image, tag string, platfor
// we allow the image to have a non-matching architecture. The code // we allow the image to have a non-matching architecture. The code
// below checks for this situation, and returns a warning to the client, // below checks for this situation, and returns a warning to the client,
// as well as logging it to the daemon logs. // as well as logging it to the daemon logs.
img, err := i.GetImage(ctx, image, imagetypes.GetImageOpts{Platform: platform}) img, err := i.GetImage(ctx, ref.String(), imagetypes.GetImageOpts{Platform: platform})
// Note that this is a special case where GetImage returns both an image // Note that this is a special case where GetImage returns both an image
// and an error: https://github.com/docker/docker/blob/v20.10.7/daemon/images/image.go#L175-L183 // and an error: https://github.com/docker/docker/blob/v20.10.7/daemon/images/image.go#L175-L183