beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48972 commits 14 branches 412 tags 338 MiB
Commit graph

628 commits

Author SHA1 Message Date
Sven Dowideit
e76e52b38b Merge pull request #23738 from psiclops/typos 
Fix misspell typos
 2016-06-22 11:56:13 +10:00
Tonis Tiigi
fb3eb1c27e Unify swarm init and update options 
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-21 16:34:32 -07:00
bin liu
950073aabb fix some typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
 2016-06-21 15:29:25 +08:00
Tonis Tiigi
e2226223e6 Skip always pulling images on integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-20 17:45:29 -07:00
nick
7135afa79b Fix misspell typos 
Signed-off-by: nick <nicholasrusso@icloud.com>
 2016-06-19 09:53:31 -07:00
Tonis Tiigi
ded1d9af38 Don’t try to restore swarm from incomplete state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-18 19:43:47 -07:00
Aaron Lehmann
b014d6a917 Merge pull request #23707 from mrjana/vendor 
Vendoring swarmkit @3f135f206179e
 2016-06-17 22:47:58 -07:00
Sebastiaan van Stijn
95074b57c6 Merge pull request #23671 from tombee/task-creation-log-debug 
Change log.printf service creation msg to debug
 2016-06-17 20:23:33 -07:00
Jana Radhakrishnan
64a567d24c Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-17 19:01:18 -07:00
Jana Radhakrishnan
4fea81154b Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-17 09:17:03 -07:00
tomwbarlow@gmail.com
eed8d14ed1 Change log.printf service creation msg to debug 
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
 2016-06-17 15:03:11 +01:00
Arnaud Porterie
f4de3f314e Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
 2016-06-17 01:40:45 +00:00
Tonis Tiigi
826f6f0703 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 16:08:15 -07:00
Tonis Tiigi
1973cee0cd Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 15:27:08 -07:00
Tonis Tiigi
a83bba467a Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 15:06:27 -07:00
Victor Vieux
a579ce8ed3 use same hash for same secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-15 17:20:18 -07:00
Victor Vieux
085895342c fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-15 17:05:10 -07:00
Brian Goff
011774e6f0 Merge pull request #23542 from mavenugo/aliases 
Use service alias and configure service VIP or dns-rr
 2016-06-15 16:18:50 -04:00
Madhu Venugopal
07e39e9e72 Use service alias and configure container's --net-alias 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-14 19:50:34 -07:00
Arnaud Porterie
bd92dd29b9 Merge pull request #23531 from tonistiigi/rm-race 
Fix race on force deleting container created by task
 2016-06-15 02:33:56 +00:00
Arnaud Porterie
91197953d0 Merge pull request #23524 from aboch/restore 
Daemon to support network restore
 2016-06-15 02:33:16 +00:00
Tonis Tiigi
25a89d73e5 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 17:23:35 -07:00
Tonis Tiigi
dcfe99278d Fix race on force deleting container created by task 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 16:49:04 -07:00
Lei Jitang
ecffb6d58c Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-14 16:45:25 -07:00
Brian Goff
87f31e379d Merge pull request #23523 from vieux/fix_mounts_swarm 
fix 2 potential panics with mounts in swarm
 2016-06-14 14:44:19 -04:00
Tonis Tiigi
499e3a45b1 Increase the join connect timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-14 10:20:47 -07:00
Victor Vieux
ffeb9fcb2a fix 2 potential panics with mounts in swarm 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-14 09:25:39 -07:00
Tonis Tiigi
534a90a993 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>
 2016-06-13 22:16:18 -07:00