Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[17.06] backport "Do not add duplicate platform information to service spec" #107

Merged
merged 2 commits into from
Jul 12, 2017
Merged

[17.06] backport "Do not add duplicate platform information to service spec" #107

merged 2 commits into from
Jul 12, 2017

Conversation

andrewhsu
Copy link
Contributor

Backport fix:

With cherry-pick of moby/moby@da85b62:

$ git cherry-pick -s -x -Xsubtree=components/engine da85b62
$ git cherry-pick -s -x -Xsubtree=components/cli/vendor/github.com/docker/docker da85b62

Signed-off-by: Nishant Totla <[email protected]>
(cherry picked from commit da85b62)
Signed-off-by: Andrew Hsu <[email protected]>
Signed-off-by: Nishant Totla <[email protected]>
(cherry picked from commit da85b62)
Signed-off-by: Andrew Hsu <[email protected]>
@andrewhsu andrewhsu changed the title Fix service spec [17.06] backport "Do not add duplicate platform information to service spec" Jul 11, 2017
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
Copy link
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aaronlehmann
Copy link
Contributor

The code duplication between the client library itself and the vendored copy in the same repo feels very strange to me. I do worry it will lead to mistakes in the future. But I understand that it's necessary with the current docker-ce concept.

So LGTM, I guess.

@nishanttotla
Copy link
Contributor

In this case, isn't it true that only the code under /cli/vendor/github.com/docker/docker will be used?

@andrewhsu andrewhsu merged commit cb9b544 into docker-archive:17.06 Jul 12, 2017
@andrewhsu andrewhsu deleted the fix-service-spec branch July 12, 2017 17:35
docker-jenkins pushed a commit that referenced this pull request May 18, 2018
Make DOCKER_BUILD_PKGS reflective
Upstream-commit: b523944
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 27, 2018
[18.09 backport] update libnetwork to fix iptables compatibility on debian
Upstream-commit: 61a250fd23db8cee48403e3d9de5de100470bd03
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[17.06] backport "Do not add duplicate platform information to service spec"
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] backport "Do not add duplicate platform information to service spec"
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants