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] Changing get network request to return predefined network in swarm #150

Merged
merged 1 commit into from Aug 1, 2017

Conversation

Projects
None yet
3 participants
@abhi
Member

abhi commented Jul 28, 2017

Starting 17.06 swarm service create supports service creates with predefined
networks like host and bridge. Due to the nature of the feature, swarm manager
has a swarm scope predefined networks in addition to local scoped
predefined networks on all nodes. However network inspects for swarm scoped
predefined networks was not possible. The fix adds support for network inspect
for swarm scoped predefined networks.

Signed-off-by: Abhinandan Prativadi abhi@docker.com

Since the cherry pick of moby/moby#34302 is not possible due to function difference. Raising this PR in docker-ce

@mavenugo

This comment has been minimized.

Show comment
Hide comment
@mavenugo

mavenugo Jul 29, 2017

Contributor

@abhinandanpb we should wait for the PR to be merged upstream and then cherry-pick it along with appropriate changes that is applicable to 17.06.

Contributor

mavenugo commented Jul 29, 2017

@abhinandanpb we should wait for the PR to be merged upstream and then cherry-pick it along with appropriate changes that is applicable to 17.06.

Changing the get network request to return swarm scope predefined net…
…works

Starting 17.06 swarm service create supports service creates with predefined
networks like host and bridge. Due to the nature of the feature, swarm manager
has a swarm scope predefined networks in addition to local scoped
predefined networks on all nodes. However network inspects for swarm scoped
predefined networks was not possible. The fix adds support for network inspect
for swarm scoped predefined networks.

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
(cherry picked from commit 5bfefb2)
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>

@andrewhsu andrewhsu added this to the 17.06.1 milestone Aug 1, 2017

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Aug 1, 2017

Collaborator

After chat with @abhinandanpb seems like the cherry-pick commit had to be adjusted for the 17.06 branch because there is a difference in the http request. Here is the original commit from upstream: moby/moby@5bfefb2

Collaborator

andrewhsu commented Aug 1, 2017

After chat with @abhinandanpb seems like the cherry-pick commit had to be adjusted for the 17.06 branch because there is a difference in the http request. Here is the original commit from upstream: moby/moby@5bfefb2

@andrewhsu andrewhsu requested a review from mavenugo Aug 1, 2017

@mavenugo

This comment has been minimized.

Show comment
Hide comment
@mavenugo

mavenugo Aug 1, 2017

Contributor

LGTM

Contributor

mavenugo commented Aug 1, 2017

LGTM

@andrewhsu andrewhsu changed the title from Changing the get network request to return swarm scope predefined net… to [17.06] Changing get network request to return predefined network in swarm Aug 1, 2017

@andrewhsu andrewhsu merged commit 2b8fb89 into docker:17.06 Aug 1, 2017

3 checks passed

ce-tests Jenkins build docker-ce-pr 65 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-pr-WoW-RS1 262 has succeeded
Details
dco-signed All commits are signed

seemethere added a commit that referenced this pull request Aug 20, 2018

Merge pull request #150 from seemethere/require
Set containerd to be a systemd bind for docker
Upstream-commit: 710ecfcf0992363047d1f9bf57be20b7459ae0c7
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment