p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,302 Commits 2 Branches 295 Tags
33bb05c1940f031ee93741410e4e2bc5986624db
Commit Graph

38 Commits

Author SHA1 Message Date
Brian Goff
da85d118fb Merge pull request #23940 from allencloud/fix-err-msg 
fix error message and typos in swarm cluster
Upstream-commit: 7ff546467de3fa3d1c1104e9f40c6d16742ebac0
Component: engine
 2016-06-24 16:57:01 -04:00
allencloud
f3ebf274bf fix error message and typos in swarm cluster 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 39bc10c36d40677c11a800b4346c5cddec2b997d
Component: engine
 2016-06-25 03:10:18 +08:00
Aaron Lehmann
5fee17f637 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>
Upstream-commit: 39c93cfb47783f2531ba44f062fd9a8b351d2224
Component: engine
 2016-06-24 12:07:47 -07:00
Aaron Lehmann
b45c320ba6 Merge pull request #23914 from tonistiigi/upadate-manager-error-message 
Add better error messages for unavailable swarm commands
Upstream-commit: e8ec19bd877847ddfd42cae4eddec83088e234fe
Component: engine
 2016-06-24 12:02:34 -07:00
Tonis Tiigi
009e2dd2e1 Add better error messages for unavailable swarm commands 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 803733120a1f9f080c6403f2a3717987393f1f0d
Component: engine
 2016-06-24 10:14:57 -07:00
Brian Goff
a463fd07fe Merge pull request #23881 from tonistiigi/exec-wait 
Fix error reporting on executor wait
Upstream-commit: e82dcf1c6de82680ae34a64735d0da0c080085ba
Component: engine
 2016-06-24 11:18:49 -04:00
Tõnis Tiigi
fbf0465b15 Merge pull request #23790 from tonistiigi/skip-pull 
Skip always pulling images on integration tests
Upstream-commit: 487931902c1177352e4eceec1b5ef558a5ba24cc
Component: engine
 2016-06-23 11:47:33 -07:00
Tonis Tiigi
9d859318a6 Fix error reporting on executor wait 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: c895a76f1076c782011e9decf58ab6548cf0fb35
Component: engine
 2016-06-22 18:12:51 -07:00
Alexander Morozov
266d9f9808 Merge pull request #23832 from tonistiigi/unify-swarm-init-update 
Unify swarm init and update options
Upstream-commit: df6630f6a3c08548f355a255e18f01c9fcb0ad86
Component: engine
 2016-06-22 11:56:07 -07:00
Sven Dowideit
a75adf3964 Merge pull request #23797 from liubin/fix-typo 
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
 2016-06-22 11:56:48 +10:00
Sven Dowideit
6e7f3b1cd8 Merge pull request #23738 from psiclops/typos 
Fix misspell typos
Upstream-commit: e76e52b38b9829ccf613995f2afa0394230800ef
Component: engine
 2016-06-22 11:56:13 +10:00
Tonis Tiigi
8c9dd4362c 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>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
 2016-06-21 16:34:32 -07:00
bin liu
923b4bd8ef fix some typos 
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
 2016-06-21 15:29:25 +08:00
Tonis Tiigi
be80ca6785 Skip always pulling images on integration tests 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e2226223e614716749cdb7701a130c7449f5f854
Component: engine
 2016-06-20 17:45:29 -07:00
nick
d62b2b14a2 Fix misspell typos 
Signed-off-by: nick <nicholasrusso@icloud.com>
Upstream-commit: 7135afa79b4d99ba2a214fcc1c2decf95f850c2f
Component: engine
 2016-06-19 09:53:31 -07:00
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
Aaron Lehmann
cb1d5362ed Merge pull request #23707 from mrjana/vendor 
Vendoring swarmkit @3f135f206179e
Upstream-commit: b014d6a9174cb881dc8a7ff1ac258b343111a27e
Component: engine
 2016-06-17 22:47:58 -07:00
Sebastiaan van Stijn
1585ae60bd Merge pull request #23671 from tombee/task-creation-log-debug 
Change log.printf service creation msg to debug
Upstream-commit: 95074b57c6958cf89e870ddcacbe4ee80ef8b8ad
Component: engine
 2016-06-17 20:23:33 -07:00
Jana Radhakrishnan
467352d977 Vendoring swarmkit @3f135f206179e 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 64a567d24c147379dc79b54cf2140c4e7905c022
Component: engine
 2016-06-17 19:01:18 -07:00
Jana Radhakrishnan
def8da9f42 Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
 2016-06-17 09:17:03 -07:00
tomwbarlow@gmail.com
b282e08783 Change log.printf service creation msg to debug 
Signed-off-by: tomwbarlow@gmail.com <tomwbarlow@gmail.com>
Upstream-commit: eed8d14ed16846f926e2d139e8232fbc2d4641e4
Component: engine
 2016-06-17 15:03:11 +01: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
b58041b07a use same hash for same secret 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a579ce8ed307024ededd527819bfdbf38e970fbf
Component: engine
 2016-06-15 17:20:18 -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
Brian Goff
a0153fe543 Merge pull request #23542 from mavenugo/aliases 
Use service alias and configure service VIP or dns-rr
Upstream-commit: 011774e6f0eb5db13fb084b2b8d4d499a9f0548b
Component: engine
 2016-06-15 16:18:50 -04: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
b0143169a4 Merge pull request #23531 from tonistiigi/rm-race 
Fix race on force deleting container created by task
Upstream-commit: bd92dd29b9436f4e6a16904e92ce2d965e994d2c
Component: engine
 2016-06-15 02:33:56 +00: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
Tonis Tiigi
08261c5b09 Fix race on force deleting container created by task 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dcfe99278db113e79dc037a6f854f4cea9eebe22
Component: engine
 2016-06-14 16:49:04 -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
Brian Goff
7636cd663b Merge pull request #23523 from vieux/fix_mounts_swarm 
fix 2 potential panics with mounts in swarm
Upstream-commit: 87f31e379d7440bc3d0896a7b964e4ed59b6249a
Component: engine
 2016-06-14 14:44:19 -04: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
Victor Vieux
9371e0d883 fix 2 potential panics with mounts in swarm 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: ffeb9fcb2a155f3495be333f9c6df41ea14c809b
Component: engine
 2016-06-14 09:25:39 -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