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

545 commits

Author SHA1 Message Date
Brian Goff
2bc2165cbf Volume mounts need to use "Binds" API field 
Swarm was putting volume type mounts into the container config's
"Volumes" field, but really these need to go into "Binds".
"Volumes" is only for normal "-v /foo" volumes, not named volumes or
anything else.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-06-30 17:00:52 -04: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
Madhu Venugopal
cf78863e9d Added missing flags for swarm-mode networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-06-29 15:30:57 -07: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
af5df117a8
Updating header name and executor 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-06-29 13:26:19 -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
Aaron Lehmann
39c93cfb47 Remove log warning on task update 
This warning appears in the course of normal use of swarm mode. Since
it's meant more as an internal TODO than something which should be
exposed to a user, remove the log message.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-06-24 12:07:47 -07:00
Aaron Lehmann
e8ec19bd87 Merge pull request #23914 from tonistiigi/upadate-manager-error-message 
Add better error messages for unavailable swarm commands
 2016-06-24 12:02:34 -07: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
Brian Goff
e82dcf1c6d Merge pull request #23881 from tonistiigi/exec-wait 
Fix error reporting on executor wait
 2016-06-24 11:18:49 -04:00
Tõnis Tiigi
487931902c Merge pull request #23790 from tonistiigi/skip-pull 
Skip always pulling images on integration tests
 2016-06-23 11:47:33 -07:00
Tonis Tiigi
c895a76f10 Fix error reporting on executor wait 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-22 18:12:51 -07:00
Alexander Morozov
df6630f6a3 Merge pull request #23832 from tonistiigi/unify-swarm-init-update 
Unify swarm init and update options
 2016-06-22 11:56:07 -07:00
Sven Dowideit
4962fea757 Merge pull request #23797 from liubin/fix-typo 
fix some typos
 2016-06-22 11:56:48 +10:00
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