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

Add dependency to docker/swarmkit #23361

Merged
merged 7 commits into from Jun 14, 2016

Conversation

Projects
None yet
@aluzzardi
Contributor

aluzzardi commented Jun 8, 2016

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.

Show outdated Hide outdated hack/vendor.sh
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

This comment has been minimized.

@ibuildthecloud

ibuildthecloud Jun 8, 2016

Contributor

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

@ibuildthecloud

ibuildthecloud Jun 8, 2016

Contributor

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

This comment has been minimized.

@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

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

This comment has been minimized.

@thaJeztah

thaJeztah Jun 8, 2016

Member

Thanks for asking though!

@thaJeztah

thaJeztah Jun 8, 2016

Member

Thanks for asking though!

This comment has been minimized.

@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

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

This comment has been minimized.

@vdemeester

vdemeester Jun 8, 2016

Member

damm @thaJeztah is quick 😹

@vdemeester

vdemeester Jun 8, 2016

Member

damm @thaJeztah is quick 😹

@justincormack

This comment has been minimized.

Show comment
Hide comment
@justincormack

justincormack Jun 8, 2016

Contributor

This needs a rebase.

Contributor

justincormack commented Jun 8, 2016

This needs a rebase.

@crosbymichael

This comment has been minimized.

Show comment
Hide comment
@crosbymichael

crosbymichael Jun 8, 2016

Contributor

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

Contributor

crosbymichael commented Jun 8, 2016

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

@icecrime

This comment has been minimized.

Show comment
Hide comment
@icecrime

icecrime Jun 14, 2016

Contributor

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.

Contributor

icecrime commented Jun 14, 2016

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

This comment has been minimized.

Show comment
Hide comment
@icecrime

icecrime Jun 14, 2016

Contributor

LGTM 👍

Contributor

icecrime commented Jun 14, 2016

LGTM 👍

@crosbymichael

This comment has been minimized.

Show comment
Hide comment
@crosbymichael

crosbymichael Jun 14, 2016

Contributor

LGTM

Contributor

crosbymichael commented Jun 14, 2016

LGTM

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Jun 14, 2016

Collaborator

LGTM

Collaborator

vieux commented Jun 14, 2016

LGTM

@icecrime

This comment has been minimized.

Show comment
Hide comment
@icecrime

icecrime Jun 14, 2016

Contributor

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.
Contributor

icecrime commented Jun 14, 2016

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

This comment has been minimized.

Show comment
Hide comment
@icecrime

icecrime Jun 14, 2016

Contributor

Nevermind we figured it out 😇

Contributor

icecrime commented Jun 14, 2016

Nevermind we figured it out 😇

@icecrime

This comment has been minimized.

Show comment
Hide comment
@icecrime

icecrime Jun 14, 2016

Contributor

image

Contributor

icecrime commented Jun 14, 2016

image

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux
Collaborator

vieux commented Jun 14, 2016

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Jun 14, 2016

Collaborator

Collaborator

tiborvass commented Jun 14, 2016

tonistiigi and others added some commits Jun 7, 2016

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>
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>
Swarm integration tests
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Add swarm api reference docs
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
add tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
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>
CLI docs
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi

This comment has been minimized.

Show comment
Hide comment
@tonistiigi

tonistiigi Jun 14, 2016

Member

LGTM

Member

tonistiigi commented Jun 14, 2016

LGTM

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Jun 14, 2016

Collaborator

LGTM

Collaborator

tiborvass commented Jun 14, 2016

LGTM

@vdemeester

This comment has been minimized.

Show comment
Hide comment
@vdemeester

vdemeester Jun 14, 2016

Member

experimal timed out after all the tests 😇

Member

vdemeester commented Jun 14, 2016

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

This comment has been minimized.

Show comment
Hide comment
@liweinan0423

liweinan0423 Oct 8, 2016

the port 4789 should be only UDP?

liweinan0423 commented on docs/swarm/swarm-tutorial/index.md in ea4fef2 Oct 8, 2016

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