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

28615 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron Lehmann
842d11f44c cli: Add options for Raft snapshotting 
Add the following options to "swarm init" and "swarm update":

- --max-snapshots: Retain this many old Raft snapshots in addition
  to the latest one

- --snapshot-interval: Number of log entries between Raft snapshots

These options already existed in SwarmKit and the Docker API but were
never exposed in the CLI. I'm adding them here to fix this oversight.

--max-snapshots may be useful for debugging purposes and more
conservative users who want to store rolling backups of old versions of
the Raft state.

--snapshot-interval is most useful for performance tuning. The default
value of 10000 may not be ideal for some setups.

There is also a LogEntriesForSlowFollowers option that is not exposed. I
decided not to expose it along with these others because I don't think
it's generally useful (and I'm not sure what I would call the CLI flag).
But if people want, I can expose it for the sake of completeness.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-08 13:14:01 -08:00
Brian Goff
16ea0806f8 Merge pull request #28140 from tonistiigi/update-fifo 
vendor: update fifo to 14056439
 2016-11-08 12:31:03 -05:00
Sebastiaan van Stijn
9a61bd05f8 Merge pull request #27466 from mrjana/net 
Retry AttachNetwork when it fails to find network
 2016-11-08 18:25:45 +01:00
Justin Cormack
3a5a0ef1d4 Merge pull request #28130 from tophj-ibm/change-jq-syntax-for-old-version-support 
[integration-cli] changes syntax to support older version of jq
 2016-11-08 14:00:59 +00:00
Brian Goff
8a396f90f5 Merge pull request #28152 from AkihiroSuda/fix-tmpfs-ro-mount 
api: fix ReadOnly support for tmpfs
 2016-11-08 08:59:48 -05:00
Akihiro Suda
189727581b Merge pull request #28158 from lixiaobing10051267/masterMakeSum 
fix using wrong function name for MakeTarSumContext
 2016-11-08 22:37:23 +09:00
Akihiro Suda
cbc511720a Merge pull request #28157 from yuexiao-wang/update-checkpoint 
Update for docker checkpoint
 2016-11-08 22:36:22 +09:00
Sebastiaan van Stijn
14a06cbb29 Merge pull request #28143 from icecrime/poule 
Add poule.yml
 2016-11-08 13:09:09 +01:00
Vincent Demeester
ec22164358 Merge pull request #28153 from YuPengZTE/devCtx 
context.Context should be the first parameter of a function
 2016-11-08 12:40:32 +01:00
Vincent Demeester
2fa63c90de Merge pull request #28144 from yongtang/11072016-swarmkit-update 
Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
 2016-11-08 12:39:03 +01:00
Vincent Demeester
d46c7109b5 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand 
Add zsh completion for new 'docker container' subcommands
 2016-11-08 11:24:28 +01:00
Vincent Demeester
9075aa4ddd Merge pull request #28038 from bfirsh/add-validate-swagger 
Validation for swagger.yaml
 2016-11-08 10:57:01 +01:00
lixiaobing10051267
71f144648a fix using wrong function name for MakeTarSumContext 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-11-08 17:16:13 +08:00
yuexiao-wang
90ce77e46a Update for docker checkpoint 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-08 16:56:29 +08:00
Sebastiaan van Stijn
f5283bd253 Merge pull request #28117 from ping035627/ping035627-patch-1107 
Modify to improve code readability
 2016-11-08 09:44:45 +01:00
Sebastiaan van Stijn
c48c44371b Merge pull request #28156 from albers/completion-service-create--tty 
Add bash completion for `docker service {create,update} --tty`
 2016-11-08 09:35:17 +01:00
Harald Albers
bfd8f7a7e1 Add bash completion for docker service {create,update} --tty 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-08 09:13:23 +01:00
yupeng
4b86bd050b context.Context should be the first parameter of a function 
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
 2016-11-08 14:51:17 +08:00
Akihiro Suda
3e3d3c8086 api: fix ReadOnly support for tmpfs 
For `--mount type=tmpfs,target=/foo,readonly`, the `readonly` flag was just ignored.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-11-08 06:49:17 +00:00
Daniel Nephin
69efb4652c Merge pull request #28076 from yongtang/25644-docker-service-tty 
Add `--tty` to `docker service create/update`
 2016-11-07 22:15:27 -05:00
Arnaud Porterie (icecrime)
7cb1fad4a5
Add poule.yml 
Add configuration for `poule` (https://github.com/icecrime/poule) to
manage GitHub automations.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-11-07 19:06:35 -08:00
Akihiro Suda
8937b35936 Merge pull request #28132 from johnstep/win2lin 
TestRunDuplicateMount requires the same host
 2016-11-08 11:32:39 +09:00
Yong Tang
f0e2eb24cf Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0 
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-07 17:57:20 -08:00
Victor Vieux
03da822ee9 Merge pull request #27923 from vieux/plugin_set_gogogo 
support env for docker plugin set
 2016-11-07 17:07:14 -08:00
Victor Vieux
efbed4500e support env for docker plugin set 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-07 16:59:29 -08:00
Victor Vieux
8442db9830 Merge pull request #27993 from thaJeztah/add-yakkety-yak 
Add Ubuntu 16.10 Yakkety Yak
 2016-11-07 16:47:12 -08:00
Tibor Vass
109c26bd74 Merge pull request #28056 from LK4D4/solaris_me 
Add functional support for Docker sub commands on Solaris
 2016-11-07 16:46:18 -08:00
Yong Tang
599be5a551 Add --tty to docker service create/update 
This fix tries to add `--tty` to `docker service create/update`. As was
specified in 25644, `TTY` flag has been added to SwarmKit and is
already vendored.

This fix add `--tty` to `docker service create/update`.

Related document has been updated.

Additional integration tests has been added.

This fix fixes 25644.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-07 16:42:32 -08:00
WangPing
2bfd1495de modify to improve code readability 
Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>

align

Signed-off-by: WangPing <present.wp@icloud.com>
 2016-11-08 08:37:44 +08:00
Michael Crosby
05b249e70f Merge pull request #28118 from runcom/fix-secopts-types 
Fix secopts types
 2016-11-07 16:32:21 -08:00
Tonis Tiigi
bebfcade04 vendor: update fifo to 14056439 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-07 16:19:03 -08:00
Tõnis Tiigi
67b0311c8c Merge pull request #27615 from darrenstahlmsft/ExecCloseAsync 
Asynchronously close streams to prevent holding container lock
 2016-11-07 16:16:21 -08:00
Misty Stanley-Jones
c16860b649 Merge pull request #28029 from tealtail/27994-add-service-ls-truncate-opt 
remove COMMAND column from `service ls` output. closes #27994
 2016-11-07 14:39:16 -08:00
Ben Firshman
5c4abd107a
Add swagger.yaml validation 
- yamllint to ensure it is a valid YAML file
- go-swagger validate to ensure it is a valid swagger file

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-07 11:03:21 -08:00
Ben Firshman
e5e1c7feef
Fix validation errors in swagger.yaml 
- Some objects were missing `type: "object"`
- Some examples had invalid null values (go-swagger validation
  doesn't support x-nullable, so they have just been removed)
- ImageSummary example was out of date
- Removed timeNano because YAML interprets it as a float, not
  a long (sigh)
- Tidy up archive errors

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-07 11:03:10 -08:00
Ben Firshman
cd0c0d0666
Add logo to swagger.yaml 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-07 11:03:09 -08:00
Aaron Lehmann
c1cdfe78f6 Merge pull request #25974 from kunalkushwaha/mount-add 
correct handling of volumes while service update.
 2016-11-07 10:34:22 -08:00
John Stephens
bc87ec3815 TestRunDuplicateMount requires the same host 
Signed-off-by: John Stephens <johnstep@docker.com>
 2016-11-07 10:19:06 -08:00
Amit Krishnan
934328d8ea Add functional support for Docker sub commands on Solaris 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-11-07 09:06:34 -08:00
Christopher Jones
1d0a5eb33f
[integration-cli] changes syntax to support older version of jq 
Fixes a bug where a test would fail due to jq syntax
not being supported on all versions. Changes the syntax
to an equivalent way also supported on older versions.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-11-07 10:54:25 -06:00
Vincent Demeester
89ef0f2151 Merge pull request #25983 from jhorwit2/jah/ps-refactor 
Add -a option to service/node ps
 2016-11-07 17:33:10 +01:00
Sebastiaan van Stijn
27beb64d46
Add Ubuntu 16.10 Yakkety Yak 
Ubuntu 16.10 has been released http://releases.ubuntu.com/yakkety/

Note that this is a short-term release, so will
EOL (and removed again) in 9 months

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-07 15:14:36 +01:00
Brian Goff
e00e7e9582 Merge pull request #28059 from lixiaobing10051267/masterDockerInfo 
Rectify Images display information for docker 1.10.3
 2016-11-07 09:05:34 -05:00
Madhu Venugopal
bee2beeaad Merge pull request #27279 from dongluochen/lbapi_integration 
Support health aware load balancing
 2016-11-07 02:42:51 -08:00
Antonio Murdaca
42a1f7cdf9
client: bump default version to v1.25 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-07 10:01:28 +01:00
Antonio Murdaca
667315576f
api: add Info struct for v1.24 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-11-07 10:01:14 +01:00
Akihiro Suda
b34b29e237 Merge pull request #28104 from Microsoft/jjh/nogoroot 
Don't set GOROOT in dockerfile.Windows
 2016-11-07 17:37:21 +09:00
Akihiro Suda
de78ed432b Merge pull request #28093 from albers/completion-run--cpus 
Add bash completion for `docker {run,create} --cpus`
 2016-11-07 17:31:40 +09:00
Akihiro Suda
67a247154c Merge pull request #28094 from albers/completion-system-df 
Add bash completion for `docker system df`
 2016-11-07 17:31:27 +09:00
Vincent Demeester
afb1119c85 Merge pull request #28096 from albers/completion-prune 
Add bash completion for new prune commands
 2016-11-07 09:30:56 +01:00