toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,228 Commits 3 Branches 295 Tags
82ca53bf588f2bc94d628671ff477f8129673d71
Commit Graph
12 Commits
Author SHA1 Message Date
Tonis Tiigi 20fc079713 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ded1d9af38cb467dadab0521936174eef0d4bc9e
Component: engine
 2016-06-18 19:43:47 -07:00
Arnaud Porterie 79ea0079e7 Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
 2016-06-17 01:40:45 +00:00
Tonis Tiigi dae11af952 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
 2016-06-16 16:08:15 -07:00
Tonis Tiigi 10f6f936be Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
 2016-06-16 15:27:08 -07:00
Tonis Tiigi e79dde3c67 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
 2016-06-16 15:06:27 -07:00
Victor Vieux 9bd6973edb fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
 2016-06-15 17:05:10 -07:00
Madhu Venugopal e306e601d2 Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 07e39e9e7283a159efa18bc8f72cb2dc0e4f700f
Component: engine
 2016-06-14 19:50:34 -07:00
Arnaud Porterie 955da7c9c3 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
Upstream-commit: 91197953d07843e34f02d6d2dc435cc4c43dfec1
Component: engine
 2016-06-15 02:33:16 +00:00
Tonis Tiigi a7a6c7f5a8 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 25a89d73e57e46dd23caebcb6446c7edd6e07f56
Component: engine
 2016-06-14 17:23:35 -07:00
Lei Jitang a05c8dd297 Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ecffb6d58cf89371e3f4a20f55c2e614dbdfe880
Component: engine
 2016-06-14 16:45:25 -07:00
Tonis Tiigi fd56910b10 Increase the join connect timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 499e3a45b17eff6d52abe6ba9063fe365415cf08
Component: engine
 2016-06-14 10:20:47 -07:00
Tonis Tiigi be63983b3a 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>
Upstream-commit: 534a90a99367af6f6bba1ddcc7eb07506e41f774
Component: engine
 2016-06-13 22:16:18 -07:00