Add dependency to docker/swarmkit #23361

Merged
merged 7 commits into from Jun 14, 2016

Projects

None yet
@aluzzardi
Contributor

Add a dependency to docker/swarmkit in preparation for adding first-class Swarm-wide service management inside the Docker Engine as described in our ROADMAP.md.

@icecrime icecrime added this to the 1.12.0 milestone Jun 8, 2016
@ibuildthecloud ibuildthecloud and 2 others commented on an outdated diff Jun 8, 2016
hack/vendor.sh
@@ -59,14 +59,14 @@ clone git github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
clone git golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
clone git golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46 https://github.com/golang/sys.git
clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
-clone git github.com/docker/go-connections v0.2.0
-clone git github.com/docker/engine-api 772250a752e34cacaeef7c92b8e0ddf43450b629
+clone git github.com/docker/go-connections fa2850ff103453a9ad190da0df0af134f0314b3d
+clone git github.com/docker/engine-api 6e7fae3cd9aa40e31cb5833d67a94ee8cff3054c git://github.com/vieux/engine-api.git
@ibuildthecloud
ibuildthecloud Jun 8, 2016 Contributor

I assume this won't stay as vieux's repo?

@thaJeztah
thaJeztah Jun 8, 2016 Member

@ibuildthecloud it should be updated after docker/engine-api#265 is accepted and merged

@thaJeztah
thaJeztah Jun 8, 2016 Member

Thanks for asking though!

@vdemeester
vdemeester Jun 8, 2016 Member

@ibuildthecloud definitely, there is a PR in review for that in engine-api 👼

@vdemeester
vdemeester Jun 8, 2016 Member

damm @thaJeztah is quick 😹

@mrjana mrjana referenced this pull request in docker/libnetwork Jun 8, 2016
Merged

Fix a lb rule race in loadbalancer #1223

@justincormack
Member

This needs a rebase.

@crosbymichael
Member

If we get the engine-api change merged this one can be merged easily. Its just a bunch of vendored deps

@icecrime
Member

In the making of this PR:

  • CLI was merged into this branch from #23363 (complete history is still available on this PR)
  • API and backend implementation was merged into this branch from #23362 (complete history is still available on this PR)

This branch is now updated with a squashed version of this work to avoid polluting master's history.

@GordonTheTurtle GordonTheTurtle added dco/no and removed dco/no labels Jun 14, 2016
@icecrime
Member

LGTM 👍

@crosbymichael
Member

LGTM

@vieux
Member
vieux commented Jun 14, 2016

LGTM

@icecrime
Member

Ping @SvenDowideit: can you please help us with that?

1:04:59 ERROR: 2016/06/14 04:04:59 site.go:1211: Two or more menu items have the same name/identifier in Menu "main": "update".
21:04:59 Rename or set an unique identifier.
@icecrime
Member

Nevermind we figured it out 😇

@icecrime
Member

image

@vieux
Member
vieux commented Jun 14, 2016
@tiborvass
Contributor

tonistiigi and others added some commits Jun 7, 2016
@tonistiigi tonistiigi Add dependency to docker/swarmkit
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
4479304
@tonistiigi tonistiigi Add Swarm management backend
As described in our ROADMAP.md, introduce new Swarm management API
endpoints relying on swarmkit to deploy services. It currently vendors
docker/engine-api changes.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
534a90a
@tonistiigi tonistiigi Swarm integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
0d88d5b
@icecrime @tonistiigi icecrime Add swarm api reference docs
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
d4abe1d
@sfsmithcha @tonistiigi sfsmithcha add tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
ea4fef2
@dnephin @tonistiigi dnephin Add Swarm management CLI commands
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
12a00e6
@amitshukla @tonistiigi amitshukla CLI docs
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
9acf97b
@tonistiigi
Contributor

LGTM

@tiborvass
Contributor

LGTM

@vdemeester
Member

experimal timed out after all the tests 😇

@tiborvass tiborvass merged commit a1e319e into master Jun 14, 2016

7 of 9 checks passed

experimental Jenkins build Docker-PRs-experimental 19914 is running
Details
gccgo Jenkins build Docker-PRs-gccgo 6785 is running
Details
docker/dco-signed All commits signed
Details
documentation success
Details
janky Jenkins build Docker-PRs 28711 has succeeded
Details
userns Jenkins build Docker-PRs-userns 10870 has succeeded
Details
vendor Jenkins build Docker-PRs-vendor 1144 has succeeded
Details
win2lin Jenkins build Docker-PRs-Win2Lin 27300 has succeeded
Details
windowsTP5 Jenkins build Docker-PRs-WoW-TP5 3199 has succeeded
Details
@sfsmithcha sfsmithcha deleted the swarm branch Jul 21, 2016
@liweinan0423

the port 4789 should be only UDP?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment