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

Host and Bridge network support in docker stack deploy #16

Merged
merged 3 commits into from
Jun 6, 2017

Conversation

mavenugo
Copy link
Contributor

@mavenugo mavenugo commented Jun 1, 2017

Cherry-picking from docker/cli#132

mavenugo and others added 3 commits May 31, 2017 19:07
be attached to special networks such as host and bridge. This fix brings
in the required changes to make sure the stack file accepts these
networks as well.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 123f0bfd9894be11cb2da401dad513fd7373d41c)
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 341703d21e88c55d3489404f9b4fbdcb1e97f98a)
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit d5b505ee8ceda32511359cff674472e349ea3a28)
@mavenugo mavenugo mentioned this pull request Jun 1, 2017
23 tasks
@andrewhsu
Copy link
Contributor

Seeing error when running test-integration-cli:

09:58:58 [DockerSwarmSuite] FAIL: docker_cli_swarm_test.go:2197: DockerSwarmSuite.TestSwarmClusterEventsSecret
09:58:58 [DockerSwarmSuite] 
09:58:58 [DockerSwarmSuite] [ddca3132901bd] waiting for daemon to start
09:58:58 [DockerSwarmSuite] [ddca3132901bd] daemon started
09:58:58 [DockerSwarmSuite] 
09:58:58 [DockerSwarmSuite] docker_cli_swarm_test.go:2219:
09:58:58 [DockerSwarmSuite]     c.Assert(out, checker.Contains, "secret remove "+id)
09:58:58 [DockerSwarmSuite] ... obtained string = ""
09:58:58 [DockerSwarmSuite] ... substring string = "secret remove rvuumd98qd5is0zvz5v1qhvz5"

@mavenugo
Copy link
Contributor Author

mavenugo commented Jun 2, 2017

Its a flaky test : moby/moby#33337 and resolved via moby/moby#33307. Should we cherry-pick moby/moby#33307 ?

@andrewhsu
Copy link
Contributor

LGTM

all other integration and cli tests are green

@andrewhsu andrewhsu merged commit 40d9516 into docker-archive:17.06 Jun 6, 2017
andrewhsu added a commit that referenced this pull request Jun 15, 2017
update rpm changelog
Upstream-commit: c79e2ca
Component: packaging
@marcusmartins
Copy link
Contributor

marcusmartins commented Jun 16, 2017

@thaJeztah @mavenugo Do we need doc changes? I am looking at https://docs.docker.com/compose/swarm/ and https://docs.docker.com/compose/networking/ for reference on how to setup local or bridge network for a service.

EDIT: Maybe the note here needs to be updated https://docs.docker.com/compose/compose-file/#network_mode

@thaJeztah
Copy link
Member

@marcusmartins can you check if the changes are already in https://github.com/docker/docker.github.io/tree/vnext-compose (which is the branch for the upcoming release), otherwise open an issue in the docs repository (or perhaps create a PR 😇 )

@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Jul 10, 2018
[18.06] Improve scalability of the Linux load balancing
Upstream-commit: c863835e99fb5ff4c121066d061e988fffd6c31a
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
Host and Bridge network support in docker stack deploy
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
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.

6 participants