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

[17.06] Changing get network request to return predefined network in swarm #150

Merged
merged 1 commit into from
Aug 1, 2017

Conversation

abhi
Copy link
Contributor

@abhi 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

@abhi abhi force-pushed the predefinednet branch 2 times, most recently from d15bb75 to 4de72d3 Compare July 28, 2017 21:52
@mavenugo
Copy link
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.

…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
Copy link
Contributor

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 August 1, 2017 17:56
@mavenugo
Copy link
Contributor

mavenugo commented Aug 1, 2017

LGTM

@andrewhsu andrewhsu changed the title Changing the get network request to return swarm scope predefined net… [17.06] Changing get network request to return predefined network in swarm Aug 1, 2017
@andrewhsu andrewhsu merged commit 2b8fb89 into docker-archive:17.06 Aug 1, 2017
seemethere added a commit that referenced this pull request Aug 20, 2018
Set containerd to be a systemd bind for docker
Upstream-commit: 710ecfc
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Feb 13, 2019
…_xattr_test

[18.09 backport] pkg/archive: fix TestTarUntarWithXattr failure on recent kernel
Upstream-commit: caabacdda57eb5a9acd870018d3b8805784a3255
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] Changing get network request to return predefined network in swarm
docker-jenkins pushed a commit that referenced this pull request May 19, 2021
Set containerd to be a systemd bind for docker
Upstream-commit: 7126d94c252a63e5bf2016454ad166018f4e5e8f
Component: engine
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Set containerd to be a systemd bind for docker
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.

3 participants