Commit Graph

272 Commits

Author SHA1 Message Date
Harald Albers d09f09929b remove --format from bash completion for docker network rm
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f03695efc100a8f35e73bf51fc694e370e019d25
Component: engine
2015-12-22 11:35:41 -08:00
Harald Albers 2d930c1a34 Better function names in bash completion
The new names make it easier to distinguish between helper functions and
functions that actually perform completion by modifying the global COMPOPT
variable.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e715daab3d531725dc4faef2265337d133bd16bc
Component: engine
2015-12-22 13:38:02 +01:00
Sebastiaan van Stijn 161c03c6c1 Merge pull request #15879 from Mashimiao/add-support-blkio_throtte_iops
Add support for blkio read/write iops device
Upstream-commit: 312c82677bdc86d50b483d642ad8c61f1c840c55
Component: engine
2015-12-21 23:45:18 +01:00
David Calavera f15d9f32b3 Merge pull request #18828 from albers/completion-plugins
Use computed plugin lists in bash completion
Upstream-commit: 88c4d4a94306f6cd6e415eb0ddd887f3fabe8a0e
Component: engine
2015-12-21 09:57:48 -08:00
Alexander Morozov 306ef7b263 Merge pull request #17692 from vdemeester/images-format
Add --format support to images command
Upstream-commit: 42460b6772323552bfb58ae703124145ffd8a56b
Component: engine
2015-12-21 09:57:29 -08:00
Harald Albers 3e4663395d Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2033c09705dc14ea32a23a9fa78d5b7d0cac1229
Component: engine
2015-12-21 18:30:23 +01:00
Vincent Demeester f41d29a49b Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 34a3c3cacf2fd827f13a5e37541acff1409658c4
Component: engine
2015-12-21 17:38:07 +01:00
Boaz Shuster 1c5df6581b Change the quiet flag behavior in the build command
Right now, the quiet (-q, --quiet) flag ignores the output
generated from within the container.

However, it ought to be quiet in a way that all kind
of diagnostic output should be ignored, unless the build
process fails.

This patch makes the quiet flag behave in the following way:
 1. If the build process succeeds, stdout contains the image ID
    and stderr is empty.
 2. If the build process fails, stdout is empty and stderr
    has the error message and the diagnostic output of that process.

If the quiet flag is not set, then everything goes to stdout
and error messages, if there are any, go to stderr.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 60b4db7eb17f4eb509be4a4968364ada2075d60c
Component: engine
2015-12-21 16:38:50 +02:00
Ma Shimiao a04e1f9592 Add support for blkio read/write iops device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 843084b08b521a70baf9284ec4e23e941ab38367
Component: engine
2015-12-21 09:14:49 +08:00
Harald Albers dde4bcd6f4 bash completion for docker daemon --authz-plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 069fe81fa602e7d8af98e2b67b761a62526f014a
Component: engine
2015-12-14 13:25:45 -08:00
Steve Durrheimer a0ef20d025 Fix small missing equal sign for 'docker daemon --cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
Steve Durrheimer 0d312f9927 Add zsh completion for 'docker daemon --authz-plugin'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
Harald Albers 2033d3841f Improve bash completion for docker network disconnect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d7c9ae60e646e827e741c2be4646d0b867cdc207
Component: engine
2015-12-07 09:55:00 +01:00
Jess Frazelle ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
Sebastiaan van Stijn 9e539c7be0 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
Add support for blkio read/write bps device
Upstream-commit: cb6a1a6042fc30e0beeaa79a2f8def4b53019483
Component: engine
2015-12-04 12:29:58 +01:00
Ma Shimiao d5560ff674 docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: cc0e407e1778b79a3c75fd68f7c7e48e5449f99b
Component: engine
2015-12-04 09:28:35 +08:00
Ma Shimiao 7be0f9667b Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 3f15a055e5c50d0f08d4c3e7cd9618d537b84f29
Component: engine
2015-12-04 09:26:03 +08:00
Jessica Frazelle a19fea4fba update bash completion for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ae76f7e23e0b9d7aceb711077a7ffc1f0e57de9c
Component: engine
2015-12-03 16:30:49 -08:00
Phil Estes 9f99937185 Merge pull request #17481 from vdemeester/17446-network-inspect-format
Add format flag to network inspect
Upstream-commit: 4d849619d48f9ad9ad7b8c7d5bc1481dae3230e4
Component: engine
2015-12-03 16:16:04 -05:00
Sebastiaan van Stijn 72c9d02b1c Merge pull request #18301 from wenchma/doc_update_for_net
Add NETWORK_NAME_or_ID value for --net= option
Upstream-commit: ee3e07d3593f97466df6fc11c19f91c1aee76dd4
Component: engine
2015-12-02 22:36:01 +01:00
Vincent Demeester f437e2a3c8 Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 295c27388dd1e7cc4196fbb8ffe0646b33bacb5b
Component: engine
2015-12-02 22:32:10 +01:00
Arnaud Porterie a7b1157339 Merge pull request #16277 from runcom/add-oom-score-adj
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
Dan Walsh 71b21cf347 This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
Wen Cheng Ma f2ea55aeff Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
Antonio Murdaca ddf1fb3149 Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: d3af7f283d8dc0be67be48e14cd740fbeb690f7a
Component: engine
2015-11-30 11:19:04 +01:00
David Calavera 63ffbd873f Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
zsh: ensure we have enough commands to store in the cache
Upstream-commit: 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1
Component: engine
2015-11-18 10:36:32 +01:00
Vincent Bernat 9ac360f32a zsh: remove lxc-related completion
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 8105a3a366bb22d1df843c828a16b6cae26e9531
Component: engine
2015-11-18 08:13:03 +01:00
Vincent Bernat f0c2b7dcae zsh: ensure we have enough commands to store in the cache
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 61564bcb5f79754cf4e17a707731d9f78169c150
Component: engine
2015-11-18 08:08:43 +01:00
Alexander Morozov fe4028f4f6 Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
Alexander Morozov cbf9321ca8 Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
Harald Albers 02d6078f37 bash completion for docker {run,create} --volume-driver
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d411c47139e9a6d94c54bfb4052e7d12bf4295f0
Component: engine
2015-11-15 09:53:22 -08:00
Vincent Demeester c0d8796b26 Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
Denis Gladkikh bba768bb09 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
Steve Durrheimer 64b4b99455 Add zsh completion for log options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 76fe00c859745bfc9c128b951ab7575fe370b7f2
Component: engine
2015-11-12 09:53:35 +01:00
Steve Durrheimer 860252559c Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9
Component: engine
2015-11-12 08:35:32 +01:00
Sebastiaan van Stijn 5c10a00d00 Merge pull request #17807 from albers/completion-network-yes
Align configuration of bash completion with existing values
Upstream-commit: ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e
Component: engine
2015-11-11 20:01:27 +00:00
Ma Shimiao 1a0735060a Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
Sebastiaan van Stijn 5474215e49 Merge pull request #17806 from albers/fix-17768
Fix bash completion on systems where extglob is not set
Upstream-commit: d575d1e0944d5b245b7b21f46015346209f4a70e
Component: engine
2015-11-10 21:32:23 +00:00
Steve Durrheimer e9d65a16e5 Add zsh completion for 'docker stats --all -a'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
2015-11-10 08:47:46 +01:00
Harald Albers 77d68ba99d bash completion for docker stats --all
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
2015-11-09 16:27:13 +01:00
Harald Albers 63a8bacd69 Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 211e3b0df67d17989c7aff63d1a0098ad61f07a3
Component: engine
2015-11-08 22:31:16 -08:00
Harald Albers 576351b40d Align configuration of bash completion with existing values
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8311db14fc2b71b5fd67f23527c3fd09a3addc85
Component: engine
2015-11-08 09:35:48 -08:00
Guilhem Lettron d04d1fe56b Fix missing -d flag in docker.fish
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
Upstream-commit: 4a3cd881721ff7986fcdc3544e67b66a259c2ca6
Component: engine
2015-11-06 11:53:17 +01:00
David Calavera f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
David Calavera ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
Steve Durrheimer 9c9f207191 Fix missing double quote in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e46445e844bca26775f88b3075d227f8e867a22a
Component: engine
2015-10-27 10:50:45 +01:00
Vincent Bernat 9d52fef685 zsh: allow option stacking for short options without arguments
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.

Therefore, this behavior is disabled by default. To enable it:

    zstyle ':completion:*:*:docker:*' option-stacking yes
    zstyle ':completion:*:*:docker-*:*' option-stacking yes

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 402caa94d23ea3ad47f814fc1414a93c5c8e7e58
Component: engine
2015-10-26 21:58:59 +01:00
Vincent Bernat fc2e9f4e02 zsh: allow short options to specify their arguments with "="
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 8ac32d900a6d1cd20e9585d012b0be414507e727
Component: engine
2015-10-26 21:58:59 +01:00
Sebastiaan van Stijn 15bb74c0cb Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
Add zsh completion for 'docker build' multi tags
Upstream-commit: 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36
Component: engine
2015-10-26 19:05:23 +01:00
Tibor Vass 80d5075264 Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
Fix repeatable options in zsh completion
Upstream-commit: 7e275cf0e5e1edff77ce9b159e995e03f6ac3371
Component: engine
2015-10-26 12:43:21 -04:00