Commit Graph

730 Commits

Author SHA1 Message Date
Vincent Demeester 1591eec643 Update documentation according to opts updates
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bbabc8172c
Component: cli
2017-06-02 00:07:02 +00:00
Dan Walsh 9e714bcbbe Fix man pages
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4a332a2e4e
Component: cli
2017-06-02 00:07:02 +00:00
Qiang Huang 20868b16c2 Simplify swappiness check
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527

The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.

I don't think this would be a problem, because:
 - like all other default values like zero, we can't differentiate
   user specify it or not, most of which, zeros are also invalid, so
   default is default, we show these default values in help info,
   so users would know if they set value as default, it'll be like
   they set nothing.
 - we can't do this kind of string check in REST api request, so
   it'll make the behave different from docker command and RESTapi.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7e4cf8a7ec
Component: cli
2017-06-02 00:07:02 +00:00
wlan0 a40aa70084 add support for maximum log size, and max number of log files
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: 7dac74d442
Component: cli
2017-06-02 00:07:01 +00:00
David Calavera e7122a31a2 Separate plugin sockets and specs.
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 412d99db51
Component: cli
2017-06-02 00:07:01 +00:00
Steve Durrheimer 2eca0b71ce Several cosmetic improvements in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 66c1b06bc4
Component: cli
2017-06-02 00:07:01 +00:00
Steve Durrheimer e5d2433008 Zsh completion update for the following commits:
- Add fluentd logging driver to zsh completion #12876
- Add inspect --type flag to zsh completion #13187
- Respect -H option in zsh completion #13195
- Fix number of argument limit for pause and unpause in zsh completion

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 31c530fd42
Component: cli
2017-06-02 00:07:01 +00:00
Sally O'Malley 4d9fd958f3 Modify man pages for image-naming
This PR adds recommendations in man pages to use only [a-z0-9-_.] when
naming and tagging images.  The purpose of this is to add consistency
and to make image naming caps rules seem less arbitrary.

This PR addresses confusion with:
1. BaseImage:Tagged (not allowed)
2. baseimage:Tagged (allowed)
3. baseimage/tagged:V1 (allowed)
4. baseimage/Tagged:V1 (not allowed)

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: bf09f5d572
Component: cli
2017-06-02 00:07:01 +00:00
Vincent Bernat 7d2ef56baf zsh: remove Vincent Bernat from reviewers for ZSH completion
Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 3a6ca4b1d8
Component: cli
2017-06-02 00:07:01 +00:00
Qiang Huang 6dbeaaf4d7 Docs: fix commandline doc create.md and run.md
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 30dbdd7943
Component: cli
2017-06-02 00:07:01 +00:00
Mrunal Patel b93f7135a0 Adds documentation for additional groups.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 7301088482
Component: cli
2017-06-02 00:07:01 +00:00
Patrick Hemmer 0d5c36bb7c add --format flag to docker version
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: 90f2c9cf90
Component: cli
2017-06-02 00:07:01 +00:00
Harald Albers 6553295dca Add some missing events to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 23256b7438
Component: cli
2017-06-02 00:07:01 +00:00
Dan Walsh 2396d45eac Robert P.J. Day found this problems in man pages
Example in docker search has an extranious -t
docker rmi has a typo

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: fe4c479f32
Component: cli
2017-06-02 00:07:01 +00:00
Raghavendra K T 88ba0fa858 Add the memory swappiness tuning option to docker.
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).

Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>
Upstream-commit: b553af956f
Component: cli
2017-06-02 00:07:01 +00:00
Doug Davis d25588047e Align 'docker commit' docs with the code
It was missing some variants and 'maintainer' isn't actually supported.
Also sorted the list of allowed cmds in the code just to make it easier
to diff with the docs.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c88c5588bf
Component: cli
2017-06-02 00:07:01 +00:00
Nate Brennand bd5d4ae937 update reference to config file
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.

Signed-off-by: Nate Brennand <nate.brennand@clever.com>
Upstream-commit: 839e00bb6f
Component: cli
2017-06-02 00:07:01 +00:00
Doug Davis 2f100155de Add support for DOCKER_CONFIG/--config to specific config file dir
Carry #11675

Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 408d7deaf7
Component: cli
2017-06-02 00:07:01 +00:00
Qiang Huang 9edf496500 Fix docs for oom-kill-disable
Addresses: #14440

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5c0cf9dbf7
Component: cli
2017-06-02 00:07:01 +00:00
Átila Camurça Alves 4ab1afc9a1 Update run.md
Put a space after the `###` in the Example section. On the github parser the result file looks ok, but in the docker page (<https://docs.docker.com/reference/run/>) looks ugly.

Signed-off-by: Átila Camurça <camurca.home@gmail.com>
Upstream-commit: fe4c3c26a3
Component: cli
2017-06-02 00:07:01 +00:00
Michael Bridgen 2405e27120 Mention network driver plugins and point to protocol docs
Signed-off-by: Michael Bridgen <mikeb@squaremobius.net>
Signed-off-by: Tom Denham <tom.denham@metaswitch.com>
Upstream-commit: 6bfc07abd2
Component: cli
2017-06-02 00:07:01 +00:00
Harry Zhang 07e7c8577e Clarify that nproc is not for per container
Fix ulimit nproc spec in daemon

Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: db7a29716e
Component: cli
2017-06-02 00:07:01 +00:00
Peeyush Gupta bc7ab3cdf2 Fixing the table rendering in reference/run.md
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com>
Upstream-commit: 7277df6cee
Component: cli
2017-06-02 00:07:00 +00:00
David Calavera 57bfdb01b7 Revert "Fix implicit DeviceMapper selection"
This reverts commit 0a376291b2213699f986a7bca1cc8c4f4ed00f8d.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 083daaeb2b
Component: cli
2017-06-02 00:07:00 +00:00
Kir Kolyshkin 2ef0c4da9d daemon.md: fix placement of exec driver heading
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 19e5936533
Component: cli
2017-06-02 00:07:00 +00:00
Doug Davis 433942510e Fix example in cmdline help text to have correct output
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 11e73c0252
Component: cli
2017-06-02 00:07:00 +00:00
Lars Kellogg-Stedman f3727792b8 Update docker commit man page re: volumes
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 569b77dda2
Component: cli
2017-06-02 00:07:00 +00:00
Tim Wraight 114a1b5710 Clarify .dockerignore example for Markdown files
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.

Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk>
Upstream-commit: 85ff60eb74
Component: cli
2017-06-02 00:07:00 +00:00
Chris McKinnel f73c587d92 Fix a broken anchor tag on the CLI builder page
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com>
Upstream-commit: c4541d3793
Component: cli
2017-06-02 00:07:00 +00:00
Ankush Agarwal 00bf9b7e19 Document the location of experimental binary
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 54ebf2ac44
Component: cli
2017-06-02 00:07:00 +00:00
Lennie 61c7fe428b Fix for broken link
The link pointed to experimental.md, but that didn't exist. It looks like README.md was intended. Probably experimental.md was renamed.

Signed-off-by: Leen Besselink <github@consolejunkie.net>
Upstream-commit: 572844ad99
Component: cli
2017-06-02 00:07:00 +00:00
David Calavera 758bcff07d Fix implicit DeviceMapper selection
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.

With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1028f69f59
Component: cli
2017-06-02 00:07:00 +00:00
Ma Shimiao 43f540b400 Unify docker commands' usage in man and help
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 75186acbff
Component: cli
2017-06-02 00:06:59 +00:00
Shishir Mahajan 4aa2c173ed Flag Addition: --type flag added for docker inspect command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 24e7d40f42
Component: cli
2017-06-02 00:06:59 +00:00
David Calavera 8de5fd2e46 Plugins JSON spec.
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7cd538db6f
Component: cli
2017-06-02 00:06:59 +00:00
Ankush Agarwal 52722c7f40 Typo in memory-swap flag
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: f7e2399648
Component: cli
2017-06-02 00:06:59 +00:00
Mary Anthony 25210bf840 Closes #13323 and carries
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5fbf370b98
Component: cli
2017-06-02 00:06:59 +00:00
Eric Sage f01f7d0493 Typo
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
Upstream-commit: 2feacfe882
Component: cli
2017-06-02 00:06:59 +00:00
Lai Jiangshan d2eb4d3e3e docs: fix file's permissions
The README.md and the *.png should not have the executable
permissions, remove them.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Upstream-commit: 11b6e1b9fd
Component: cli
2017-06-02 00:06:59 +00:00
TAGOMORI Satoshi 12591b7963 Update English expressions by review comments
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: 398c74e0a9
Component: cli
2017-06-02 00:06:59 +00:00
TAGOMORI Satoshi 8f232c6c53 Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: c240006d20
Component: cli
2017-06-02 00:06:59 +00:00
John Howard d9083672d0 Fix docs for #14047
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2049a1703
Component: cli
2017-06-02 00:06:59 +00:00
fl0yd 23b01970ec Update plugins_volume.md
Signed-off-by: Mark Oates <fl0yd@me.com>
Upstream-commit: a5791e2541
Component: cli
2017-06-02 00:06:59 +00:00
Lai Jiangshan b95868bcf0 man: convert docker/docs/man to docker/man
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Upstream-commit: e438dd5f6e
Component: cli
2017-06-02 00:06:59 +00:00
Mary Anthony 36c7167e96 Splitting out the cli command into parts.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4f9fac3803
Component: cli
2017-06-02 00:06:59 +00:00
Chun Chen ea0f82ab96 Set exit code of old running container as 137
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
Upstream-commit: 686e6d31e7
Component: cli
2017-06-02 00:06:59 +00:00
Mary Anthony 0bd517dc5c Breaking logging driver material out of run
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2e3dc04935
Component: cli
2017-06-02 00:06:59 +00:00
David Calavera 6c14839c1e Move zfs options doc to the storage section.
Zfs options belong to the storage section, but they were added under the exec driver section.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1a184988a2
Component: cli
2017-06-02 00:06:59 +00:00
Dennis Docter 9ae79c61c1 Add --log-opt to specify facility for syslog driver
Signed-off-by: Dennis Docter <dennis@d23.nl>
Upstream-commit: 6970c146e0
Component: cli
2017-06-02 00:06:59 +00:00
Tobias Bradtke 870bf94b3d Typo
Signed-off-by: Tobias Bradtke <webwurst@gmail.com>
Upstream-commit: eeceb060e4
Component: cli
2017-06-02 00:06:59 +00:00