This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
[17.10] Backport version fix for Windows manifest lists #266
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update logic to choose manifest from manifest list to check for os version on Windows. Separate the logic for windows and unix to keep unix logic the same. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (cherry picked from commit 38aef56) Signed-off-by: John Stephens <johnstep@docker.com>
Signed-off-by: John Stephens <johnstep@docker.com> (cherry picked from commit 8ed8f4a) Conflicts: components/engine/distribution/pull_v2_windows.go Signed-off-by: John Stephens <johnstep@docker.com>
|
cc @jhowardmsft |
|
Hmm...just one test failure on s390x tests: |
docker-jenkins
pushed a commit
that referenced
this pull request
Nov 28, 2018
[18.09] Add libseccomp requirement for rpm packages Upstream-commit: 9a7acfb9942edb67ce429f6d78c228036b0d465f Component: packaging
docker-jenkins
pushed a commit
that referenced
this pull request
Jun 11, 2019
…d_gid_mappings [19.03 backport] Stop sorting uid and gid ranges in id maps Upstream-commit: a8d1b4a1ab031ace6d47d53366ee252b655d6538 Component: engine
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Feb 3, 2020
[17.10] Backport version fix for Windows manifest lists
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport fix:
with cherry pick of moby/moby@38aef56 and moby/moby@8ed8f4a:
Conflict with
pull_v2.goin moby/moby@8ed8f4a resolved by reverting back to detecting the OS the previous way (before it was supplied as a parameter) and also only sorting for Windows (like in current master) as 17.10 has not backported moby/moby@d98ecf2.