Skip to content
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
Merged

Add dependency to docker/swarmkit #23361

merged 7 commits into from
Jun 14, 2016

Conversation

aluzzardi
Copy link
Member

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
@thaJeztah thaJeztah added the status/failing-ci Indicates that the PR in its current state fails the test suite label Jun 8, 2016
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking though!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

damm @thaJeztah is quick 😹

@justincormack
Copy link
Contributor

This needs a rebase.

@crosbymichael
Copy link
Contributor

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

@tonistiigi tonistiigi force-pushed the swarm branch 2 times, most recently from e86213b to ed7aeb3 Compare June 14, 2016 01:52
@GordonTheTurtle GordonTheTurtle added the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jun 14, 2016
@icecrime
Copy link
Contributor

In the making of 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 Automatically set by a bot when one of the commits lacks proper signature and removed dco/no Automatically set by a bot when one of the commits lacks proper signature labels Jun 14, 2016
@GordonTheTurtle GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jun 14, 2016
@icecrime icecrime removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Jun 14, 2016
@icecrime
Copy link
Contributor

LGTM 👍

@crosbymichael
Copy link
Contributor

LGTM

1 similar comment
@vieux
Copy link
Contributor

vieux commented Jun 14, 2016

LGTM

@icecrime
Copy link
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.

@icecrime
Copy link
Contributor

Nevermind we figured it out 😇

@icecrime
Copy link
Contributor

image

@vieux
Copy link
Contributor

vieux commented Jun 14, 2016

@mlaventure
bumble_bee

@tiborvass
Copy link
Contributor

tonistiigi and others added 7 commits June 13, 2016 22:16
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>
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>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
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>
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Charles Smith <charles.smith@docker.com>
@tonistiigi
Copy link
Member

LGTM

1 similar comment
@tiborvass
Copy link
Contributor

LGTM

@vdemeester
Copy link
Member

experimal timed out after all the tests 😇

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

Successfully merging this pull request may close these issues.