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

24 commits

Author SHA1 Message Date
Alexander Morozov
db75aa029d Merge pull request #24173 from vdemeester/tasks-filter-service-node-by-name 
Allow service and node filter to be name in `tasks` subcommands
 2016-07-05 12:16:57 -07:00
Otto Kekäläinen
644a7426cc Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
 2016-07-03 20:58:11 +03:00
Tõnis Tiigi
8fe6480c8a Merge pull request #23584 from nishanttotla/private-images-swarm-services 
Passing registry auth token for service create, update
 2016-06-30 17:18:59 -07:00
Nishant Totla
538bac39d7
Adding a flag to specify sending of registry auth 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-30 14:59:32 -07:00
Vincent Demeester
b0fc5a21f1
Allow service and node filter to be name… 
… on `docker node tasks` and `docker service tasks` commands.
This changes is mainly server-side (between engine api and
swarmkit). There is just a check in `api/client/service/tasks.go` to
handle the special *self* meaning.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-30 15:09:03 +02:00
Alexander Morozov
9162011680 Merge pull request #23789 from tonistiigi/swarm-integration-tests 
Update swarm integration tests and shutdown synchronization
 2016-06-29 14:09:57 -07:00
Nishant Totla
93ec5cda55
Passing registry auth token for service create and update 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-28 13:53:01 -07:00
Tonis Tiigi
1a8a473017 Fix race on clearing swarm nodes on stop 
On stop there were multiple places that marked
`cluster.node` nil. Now stop waits for the node to
set itself nil.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 13:57:02 -07:00
Brian Goff
7ff546467d Merge pull request #23940 from allencloud/fix-err-msg 
fix error message and typos in swarm cluster
 2016-06-24 16:57:01 -04:00
allencloud
39bc10c36d fix error message and typos in swarm cluster 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-25 03:10:18 +08:00
Tonis Tiigi
803733120a Add better error messages for unavailable swarm commands 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-24 10:14:57 -07: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
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
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
085895342c fix docker swarm init/update --secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-15 17:05:10 -07: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
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
Lei Jitang
ecffb6d58c Daemon to support network restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-06-14 16:45:25 -07: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
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