This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[18.09 backport] Fix client version not being pinned when set, and some refactoring#188
Merged
andrewhsu merged 4 commits intodocker-archive:18.09from Sep 23, 2019
Conversation
Member
Author
|
@dperny @tiborvass @tonistiigi PTAL (see the first comment for the changes I picked; happy to get your feedback) |
|
I'm fine with this, although it would be better to have a tool where you resolve the conflict once, and save that logic for further rebases until it's unable to decide again. |
Member
Author
|
Looks like moby#38486 has been backported as part of #198; rebasing |
Signed-off-by: Peter Kang <peter@spell.run> (cherry picked from commit be2f7ce) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 01eb35b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 69d9ff3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3d72963) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.09_backport_fix_version_override
branch
from
967442a to
3c7ff49
Compare
|
Looks like this one may need to be vendored in docker/cli as well. |
kolyshkin
added a commit
to kolyshkin/cli
that referenced
this pull request
Sep 23, 2019
Bump github.com/docker/engine to include docker-archive/engine#188 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Indeed. docker/cli#2100 |
kolyshkin
added a commit
to kolyshkin/cli
that referenced
this pull request
Sep 24, 2019
Bump github.com/docker/engine to include docker-archive/engine#188 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
added a commit
to kolyshkin/cli
that referenced
this pull request
Sep 24, 2019
Bump github.com/docker/engine to include docker-archive/engine#188 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Oct 23, 2019
Bump github.com/docker/engine to include docker-archive/engine#188 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Upstream-commit: 7a964b3b60bdf1110eb9da652f904446aaedb00e Component: cli
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
This backports moby#38909 (Fix client version not being pinned when set) to the 18.09 branch.
When backporting, I noticed that there were some refactorings and cleanups in this area, which I decided to include here as well;
note that those are not strictly needed for the actual fix; the fix is quite small, and could easily be modified to work on the 18.09
branch, but in light of future backports and maintenance, I thought it'd be good to include those refactors.
If this is a concern, I'm happy to create a modified patch and only backport the fix.
Included in this PR:
Remove use of deprecated client.NewEnvClient() moby/moby#38486 Remove use of deprecated client.NewEnvClient()Description for the changelog
Fix client version not being pinned when set.