This repository was 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
andrewhsu merged 1 commit intodocker-archive:17.06from Aug 1, 2017
Merged
Conversation
abhi
force-pushed
the
predefinednet
branch
2 times, most recently
from
d15bb75 to
4de72d3
Compare
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>
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 |
Contributor
|
LGTM |
andrewhsu
changed the title
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
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.
3 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.
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