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

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

Merged
merged 2 commits into from Jul 12, 2017

Conversation

@andrewhsu
Copy link
Contributor

commented Jul 11, 2017

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
Do not add duplicate platform information to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit da85b62)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Do not add duplicate platform information to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit da85b62)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

@andrewhsu andrewhsu changed the title Fix service spec [17.06] backport "Do not add duplicate platform information to service spec" Jul 11, 2017

@thaJeztah
Copy link
Member

left a comment

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

@nishanttotla
Copy link
Contributor

left a comment

LGTM

@aaronlehmann

This comment has been minimized.

Copy link
Contributor

commented Jul 12, 2017

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

This comment has been minimized.

Copy link
Contributor

commented Jul 12, 2017

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:17.06 Jul 12, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 155 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 144 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:fix-service-spec branch Jul 12, 2017

docker-jenkins pushed a commit that referenced this pull request May 18, 2018
Merge pull request #107 from seemethere/reflect
Make DOCKER_BUILD_PKGS reflective
Upstream-commit: b523944cf7a026b0b674b2580f4c635fb6660e26
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 27, 2018
Merge pull request #107 from thaJeztah/18.09_backport_bump_libnetwork
[18.09 backport] update libnetwork to fix iptables compatibility on debian
Upstream-commit: 61a250fd23db8cee48403e3d9de5de100470bd03
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.