Commit Graph

1524 Commits

Author SHA1 Message Date
f7b4103706 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>
Upstream-commit: 842d11f44cede2d7e9488e54f8ac8de89d8f4cd4
Component: engine
2016-11-08 13:14:01 -08:00
379e810a82 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
Add zsh completion for new 'docker container' subcommands
Upstream-commit: d46c7109b520bfe485b4c9ca5f59a3768b444aa0
Component: engine
2016-11-08 11:24:28 +01:00
08efaac2fe Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bfd8f7a7e15a0a4eece33e545368e915470147e0
Component: engine
2016-11-08 09:13:23 +01:00
c56f371dbf Merge pull request #27993 from thaJeztah/add-yakkety-yak
Add Ubuntu 16.10 Yakkety Yak
Upstream-commit: 8442db98306ccb5217daa2caeeb63087588b56c4
Component: engine
2016-11-07 16:47:12 -08:00
f364a8ccb7 Merge pull request #28056 from LK4D4/solaris_me
Add functional support for Docker sub commands on Solaris
Upstream-commit: 109c26bd7482280946e356b33f17f4d82112dff3
Component: engine
2016-11-07 16:46:18 -08:00
6fb90ed484 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>
Upstream-commit: 934328d8ea650bf8a9c3c719999ce2a1f5dd5df6
Component: engine
2016-11-07 09:06:34 -08:00
549c168518 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>
Upstream-commit: 27beb64d468614db0eb7344340d39b5619219a7d
Component: engine
2016-11-07 15:14:36 +01:00
9156f6f7cf Merge pull request #28093 from albers/completion-run--cpus
Add bash completion for `docker {run,create} --cpus`
Upstream-commit: de78ed432ba526ca463d191e3ac143bc107c00f5
Component: engine
2016-11-07 17:31:40 +09:00
a76d4f99db Merge pull request #28094 from albers/completion-system-df
Add bash completion for `docker system df`
Upstream-commit: 67a247154c60ef924ca41a57f4720d4b9f3a5f65
Component: engine
2016-11-07 17:31:27 +09:00
cd10215557 Merge pull request #28096 from albers/completion-prune
Add bash completion for new prune commands
Upstream-commit: afb1119c851c5da7b85bc5d51f9d642113f994a5
Component: engine
2016-11-07 09:30:56 +01:00
e3849dda91 Fix bash completion for docker inspect --type
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d65934a8b85b961b95fcb1443f2191bef23df17b
Component: engine
2016-11-05 11:22:47 -07:00
f51ce2d41b Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8099280cd81bf1e6e0cbaf8a3ba728ec1ccb1d50
Component: engine
2016-11-05 10:39:33 -07:00
e6605af98d Add bash completion for docker system df
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 09172051fc90c55bb06359b60918d15feb9aecc4
Component: engine
2016-11-05 10:12:35 -07:00
4a58c855ef Add bash completion for docker {run,create} --cpus
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9268bbaeeaebe68a5ccd2f32277059e80aac2d8c
Component: engine
2016-11-05 09:59:55 -07:00
cdb85c6084 Merge pull request #28068 from tophj-ibm/switch-all-golang-download-links
switch all go download links to https://golang.org/dl
Upstream-commit: 6087185676ef838c20af3dace1bbd442b6bdb53c
Component: engine
2016-11-04 14:21:58 -07:00
ac2b6ee292 Merge pull request #27737 from justincormack/no-ambient-1.13
Revert ambient capabilities for 1.13
Upstream-commit: cac13fc131c4e539a412ef46d3828dc79453c524
Component: engine
2016-11-04 12:52:21 -07:00
889abdab10 Add bash completion for docker service create --hostname
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
b865964d4d Use runc version built without ambient capabilities
Until we can support existing behaviour with `sudo` disable
ambient capabilities in runc build.

Add tests that non root user cannot use default capabilities,
and that capabilities are working as expected.

Test for #27590

Update runc.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c5251f7116e3d9095a7169fc31bd170dff997c2e
Component: engine
2016-11-04 17:25:28 +00:00
4ca3d7782b switch all go download links to https://golang.org/dl
this switches all go download links to use a redirect,
https://golang.org/dl/ instead of the direct source.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 732d1035d2f1d8f0b6f3410035fa393431b93d89
Component: engine
2016-11-04 09:03:41 -05:00
217225ece0 Cleanup after moving all zsh completion logics for the new container command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 94863d8c63dbdb811afba20b79d0502903fdd313
Component: engine
2016-11-04 08:55:16 +01:00
5f2dda8fc5 Move zsh completion logic to new subcommand: wait
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6a662de9650c19d8ada575badee4a5e4f3290e5d
Component: engine
2016-11-04 08:55:13 +01:00
6ffd295baf Move zsh completion logic to new subcommand: update
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b25603391c3ed562d136aa0eafcd7b35ff6c686a
Component: engine
2016-11-04 08:55:12 +01:00
a02dd8aa90 Move zsh completion logic to new subcommand: top
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 07a3ccec0a677aa198afa8b407f75c48cebd033a
Component: engine
2016-11-04 08:55:10 +01:00
0dca92ce6c Move zsh completion logic to new subcommand: stop
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6aff1be4303aff902a1997a300d910a6bfd19445
Component: engine
2016-11-04 08:55:09 +01:00
09263a74a2 Move zsh completion logic to new subcommand: stats
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d0e4f7fbe69d189a39a2c35584aee12dfe1cec2f
Component: engine
2016-11-04 08:55:07 +01:00
f0856717ce Move zsh completion logic to new subcommand: start
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8e5285c283ac352702689a652eab13ba93d4bb41
Component: engine
2016-11-04 08:55:05 +01:00
413c4301a9 Move zsh completion logic to new subcommand: run
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dcc5b72020382d2b379c26d25d6e173609e1c2fc
Component: engine
2016-11-04 08:55:04 +01:00
78134a2469 Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1df32a4f6c3160a6bbe7ab5a36be6e10ea51616f
Component: engine
2016-11-04 08:55:02 +01:00
5a143d3097 Move zsh completion logic to new subcommand: restart
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 64b546e7b8e6248eadd4e452d4e91d74f88563f5
Component: engine
2016-11-04 08:55:01 +01:00
a591b6cdc1 Move zsh completion logic to new subcommand: rename
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fc6bd2272525772ab5c05cad2679a06afdfabb51
Component: engine
2016-11-04 08:54:59 +01:00
68f554a891 Move zsh completion logic to new subcommand: port
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4ffc37224dbf9bcfe11a3e81c42d090bbe5761e1
Component: engine
2016-11-04 08:54:58 +01:00
5fd4d1e40f Move zsh completion logic to new subcommand: pause, unpause
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e602bfbc34bb69bb2c9f0e08b4bfe31362dd36fc
Component: engine
2016-11-04 08:54:56 +01:00
f023ac8daf Move zsh completion logic to new subcommand: ps
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 44bb318161a0406e121c231b735395536fab27c7
Component: engine
2016-11-04 08:54:55 +01:00
c4f4b9e65d Move zsh completion logic to new subcommand: logs
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 28bd6162126c0d494b2d8379e2608a1fc7017aa7
Component: engine
2016-11-04 08:54:53 +01:00
03b262c50c Move zsh completion logic to new subcommand: kill
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 45fdea257c7ee8c96249a8772809d23768ed7612
Component: engine
2016-11-04 08:54:51 +01:00
bd9b143f60 Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e5424b656b0eeb7006384d8846c8e05e02a9e35f
Component: engine
2016-11-04 08:54:50 +01:00
4553330ab9 Move zsh completion logic to new subcommand: export
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 911ef73ee1777eaa7cac08dadaf77bdd9cc9a2e5
Component: engine
2016-11-04 08:54:48 +01:00
509642ffb2 Move zsh completion logic to new subcommand: exec
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ee27e97218e2c37bfb3adbef643d671ca75cc18d
Component: engine
2016-11-04 08:54:47 +01:00
3848320570 Move zsh completion logic to new subcommand: diff
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0632c344398ce0b36f14e6c100153892c0933145
Component: engine
2016-11-04 08:54:45 +01:00
bbacc2e9b9 Move zsh completion logic to new subcommand: create
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: abf2f0087d46a2568b1830a819c99b1fb90de445
Component: engine
2016-11-04 08:54:44 +01:00
fdac29909c Move zsh completion logic to new subcommand: cp
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b067a59bfd8dc8a5758eaa4d03c948b100a4af7b
Component: engine
2016-11-04 08:54:42 +01:00
15956ca1d6 Move zsh completion logic to new subcommand: commit
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 89737ea253bad50da4674b708c6e3378d0ebfe42
Component: engine
2016-11-04 08:54:40 +01:00
ed305ee046 Move zsh completion logic to new subcommand: attach
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d5ca5c1e084845c8558a598ea7dfde9bfe6cd24d
Component: engine
2016-11-04 08:54:39 +01:00
2301f39de7 Add zsh completion for 'docker container' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a9443b738856f9562c8e50a8838a79e1378857b0
Component: engine
2016-11-04 08:54:37 +01:00
1d0f8b0e25 Rename containers complete function in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 431e9cb27c26be44ea116517635a31745c3f19bc
Component: engine
2016-11-04 08:54:27 +01:00
ba87ff5ff2 Merge pull request #28046 from tophj-ibm/make-debs-1610
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04:00
8ef82a0e0b Merge pull request #28021 from YuPengZTE/devString
Add “” for String
Upstream-commit: 6b3b9d53e1cb0db90d3e25881fcf1e225179040e
Component: engine
2016-11-03 17:03:56 -07:00
45efa44b4f [ppc64le] add yakkety yak to 'make deb'
This adds 'make deb' support for yakkety yak on ppc64le

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: da382044d3630bcdeb1eac64f2f7ad476e0cf007
Component: engine
2016-11-03 15:59:59 -04:00
dc399e49f2 [ppc64le] update make deb go download link
Updates the ppc64le `make deb` trusty download link to be
consistent with the other Dockerfiles. Also minor clarification
to how we install go.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
2016-11-03 15:26:28 -04:00
d70c70756d Add for String
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 167daf5060e75a597d70fd7240d59d34b160f8ef
Component: engine
2016-11-03 16:15:26 +08:00