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.

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

distribution: fix multi-arch Windows image preference #42425

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

fsiegmund
Copy link

@fsiegmund fsiegmund commented May 26, 2021

Signed-off-by: fsiegmund siegmund@slb.com

- What I did

Changes in pull_vs2_windows.go:

- How I did it

Change sorting logic of image, using comparable image versions. Images that exactly match host OS version will be moved to the top, followed by versions that match host build, in descending order.

- How to verify it

See #42423. Create multi arch image and pull. The image with exact host version will be preferred. Otherwise as logic above.

- Description for the changelog

  • consider UBR in Windows multi-arch image pull

- A picture of a cute animal (not mandatory but encouraged)

ฅ ̳͒•ˑ̫• ̳͒ฅ

Signed-off-by: fsiegmund <siegmund@slb.com>
@thaJeztah thaJeztah added area/distribution impact/changelog kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. platform/windows status/2-code-review labels May 26, 2021
@thaJeztah thaJeztah added this to the 21.xx milestone May 26, 2021
@thaJeztah
Copy link
Member

@crazy-max @tonistiigi ptal

We were discussing this in the maintainers meeting, and want to look if this code should possibly be in the containerd package (so that there's a more central / canonical place where the matching behaviour is defined)

@frs3
Copy link

frs3 commented Jan 20, 2022 via email

@thaJeztah
Copy link
Member

I kept forgetting to comment (and didn't come round to looking closely at the changes ☺️), but it came up in a discussion, and I know @tonistiigi and @crazy-max were working on some changes in containerd in this area, so O was hoping they would be able to assist.

If possible, yes, I think this code would ideally live in containerd, but (as mentioned) I haven't had a close look to see if it's easy to move it there (and then consume it in this repository as vendored code), but if you have time to look doing so, that would be great!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/distribution impact/changelog kind/enhancement Enhancements are not bugs or new features but can improve usability or performance. platform/windows status/2-code-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Multi-arch: Windows image pull does not pull best match
4 participants