Commit Graph

376 Commits

Author SHA1 Message Date
a4e4b607e4 Update API history and man page for --filter expose/publish
This fix updates API history and man page for
`docker ps --filter expose/publish`, from the feedback:
https://github.com/docker/docker/pull/27557#issuecomment-276832876

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d77db0bd9a
Component: cli
2017-06-02 00:10:53 +00:00
8d23e38798 added ppc64le and s390x fixes for manpages
Fixes manpages for p and z by downloading a specific version
of go instead of relying on the distro version.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d39215cbaa
Component: cli
2017-06-02 00:10:53 +00:00
7fdb8e3901 remove musl-dev in man/Dockerfile.armhf
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ff9b736d52
Component: cli
2017-06-02 00:10:53 +00:00
ed74cb5919 use precompiled go from google, needs debian to work
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a39f753e56
Component: cli
2017-06-02 00:10:52 +00:00
ed59737443 from golang:1.7.5-alpine for docker-manpage-dev
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 6d4b51d1a9
Component: cli
2017-06-02 00:10:52 +00:00
301a68b5ae Add markdown for man page of docker plugin ls
This fix adds markdown for man page of `docker plugin ls`,
based on https://github.com/docker/docker/pull/28627#issuecomment-276731752

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6686179ff5
Component: cli
2017-06-02 00:10:52 +00:00
f08bf3eff7 Make markdown for man pages of docker container ... consistent
This fix updates the markdown for man pages of `docker container ...`
so that they are consistent. The changes are based on feedback:
https://github.com/docker/docker/pull/30645#discussion_r99020188
https://github.com/docker/docker/pull/30645#discussion_r99020304

1. Use `H2 (##)` as needed
2. Use unrpiviledged prompt (`$`) instead of (`#`)

This PR convers files under man/src/container/*.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b8b156f343
Component: cli
2017-06-02 00:10:52 +00:00
a83525f5e9 Add daemon option --default-shm-size
This fix fixes issue raised in 29492 where it was not
possible to specify a default `--default-shm-size` in daemon
configuration for each `docker run``.

The flag `--default-shm-size` which is reloadable, has been
added to the daemon configuation.
Related docs has been updated.

This fix fixes 29492.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 205ebd8d30
Component: cli
2017-06-02 00:10:52 +00:00
6ff57bcab1 Add example for device-cgroup-rule to man
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 48fdaee058
Component: cli
2017-06-02 00:10:51 +00:00
daeec5c32c Allow adding rules to cgroup devices.allow on container create/run
This introduce a new `--device-cgroup-rule` flag that allow a user to
add one or more entry to the container cgroup device `devices.allow`

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: e9ad0f345f
Component: cli
2017-06-02 00:10:51 +00:00
edbd133210 Docs: Be more clear when specifying valid formats for strings
- Use the word letter rather than character to refer to letters ;) when trying to specify that only letters and numbers can be used, and not ANY character...
- Small corrections

Fixes #29821

Signed-off-by: Timothy Hobbs <timothy@hobbs.cz>
Upstream-commit: 46c619655f
Component: cli
2017-06-02 00:10:50 +00:00
fe2c8c26f0 Add docs for run|create --init|--init-path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: da15de5f1b
Component: cli
2017-06-02 00:10:50 +00:00
6cadd5ebe4 Clarify cp documentation behaviour with trailing "/."
Issue #30082 demonstrated that their is possible confusion with the "/."
where the tailing "." can appear to be merely punctuation within the
document rather than a highly pertinent part of `SRC_PATH`.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 4db608f186
Component: cli
2017-06-02 00:10:48 +00:00
8832918e96 Fix incorrect alias and URL
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 70d63dce63
Component: cli
2017-06-02 00:10:48 +00:00
4fbe81294a keep network option consistent between network connect and run
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 6337d3724e
Component: cli
2017-06-02 00:10:48 +00:00
ae3f860511 Provide correct command imformation and URL
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 30f009076e
Component: cli
2017-06-02 00:10:48 +00:00
7632076475 replace no-remove by sample-volume-plugin in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 63aa05d3f7
Component: cli
2017-06-02 00:10:47 +00:00
633a71429a Read long description from a file.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5bd015e2d9
Component: cli
2017-06-02 00:10:47 +00:00
10b208e016 Update the manuals of docker and dockerd
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b193004923
Component: cli
2017-06-02 00:10:46 +00:00
3000095596 Add missing "--default-runtime" flag in manpage
Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ef5fb30f61
Component: cli
2017-06-02 00:10:46 +00:00
b768cd6312 Clarify what docker diff shows
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: fbb21b0191
Component: cli
2017-06-02 00:10:46 +00:00
57b5fdb41c Add docker-update description ommited in docker.1.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f03fd566f6
Component: cli
2017-06-02 00:10:45 +00:00
8ddacc9277 [docs,man] Fixed typo (#29516)
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: b9c6e9ef21
Component: cli
2017-06-02 00:10:45 +00:00
5b8e4af26b Fix inconsistency for pause and unpause
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: dd1e172adb
Component: cli
2017-06-02 00:10:45 +00:00
e0a7ab71aa Add docs for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a325d3ea2a
Component: cli
2017-06-02 00:10:44 +00:00
1d2468df13 Update the manual for docker wait
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: fe9be95dec
Component: cli
2017-06-02 00:10:44 +00:00
668d35e913 Fix the incorrect option name
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4df2866d4e
Component: cli
2017-06-02 00:10:44 +00:00
a8153231ae Update the option 'network' for docker build
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 378a9d816b
Component: cli
2017-06-02 00:10:44 +00:00
c7e1b80d2b add SCOPE field content for docker network ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 6cc17b6549
Component: cli
2017-06-02 00:10:43 +00:00
7cef2520f3 rectify several wrong URLs in branch of man
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ae2c5f63e5
Component: cli
2017-06-02 00:10:43 +00:00
bf80e1d186 modify some urls related to reference path
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: bfa5aeec42
Component: cli
2017-06-02 00:10:42 +00:00
f60e8dbe1d cli: remove --mount from docker run
This commit reverts 273eeb813c1db0f42c2ad5e053972eeb00907568 (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: a5053dce24
Component: cli
2017-06-02 00:10:42 +00:00
2aa00fd89f Added and example of using --format with docker images
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

Signed-off-by: William Henry <whenry@redhat.com>
Upstream-commit: 9fa1e6637b
Component: cli
2017-06-02 00:10:42 +00:00
e95c1665fd fix the mistake of present
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: 4b2c41c1b8
Component: cli
2017-06-02 00:10:41 +00:00
430522a380 28600: Docs: network connect for container in Created/Stopped state
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
Upstream-commit: 1f2128a8c5
Component: cli
2017-06-02 00:10:40 +00:00
ca2113e23f Update docker info cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0202ece8e1
Component: cli
2017-06-02 00:10:40 +00:00
74de856edc Rename Remote API to Engine API
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 2cfcc8a8fa
Component: cli
2017-06-02 00:10:40 +00:00
0dcf74fa3b fix typo
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1ce4af2038
Component: cli
2017-06-02 00:10:39 +00:00
7456ec0c6e Change the docker-tag usage text to be clearer
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: c4776804f4
Component: cli
2017-06-02 00:10:39 +00:00
ee6097675a Update stats cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d22558eb16
Component: cli
2017-06-02 00:10:39 +00:00
481c891999 Update docs for docker info for most recent changes.
This fix updates docs for `docker info` for most recent changes.
It also made several chagnes:
1. Replace 0.12.0-dev to 0.13.0 for api docs v1.24.
2. Replace 0.13.0-dev to 0.13.0 for api docs v1.25

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 241694402f
Component: cli
2017-06-02 00:10:39 +00:00
c7b13334f3 man/docker: wrap lines consistently
Quite a few changes, as it seems like previous wrapping was done
manually, so it's all over the place.

As noted in #28424

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: 87b3ad76c9
Component: cli
2017-06-02 00:10:39 +00:00
9d670c8fad Updated daemon documentation to clarify that live-restore is not suppoted on windows
Review comment implementation

Signed-off-by: bbayani <bhumikabayani@gmail.com>
Upstream-commit: 00f00e726e
Component: cli
2017-06-02 00:10:38 +00:00
06dc99005c man page: consistent indents for flag descriptions
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
Upstream-commit: 0ceda7965d
Component: cli
2017-06-02 00:10:38 +00:00
890a070951 Add --dns-option to docker run and hide --dns-opt
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055

In #27567, `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.

This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.

This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.

This fix also updates the docs and bash/zsh completion scripts.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ebacbb50ae
Component: cli
2017-06-02 00:10:36 +00:00
17f22ba07a Align arg with other cli
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: f5298c5f4d
Component: cli
2017-06-02 00:10:32 +00:00
190608ece5 Windows: Add cpu count option
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 09e1fc1540
Component: cli
2017-06-02 00:10:32 +00:00
b1abdb7217 Add --cpus flag to control cpu resources
This fix tries to address the proposal raised in 27921 and add
`--cpus` flag for `docker run/create`.

Basically, `--cpus` will allow user to specify a number (possibly partial)
about how many CPUs the container will use. For example, on a 2-CPU system
`--cpus 1.5` means the container will take 75% (1.5/2) of the CPU share.

This fix adds a `NanoCPUs` field to `HostConfig` since swarmkit alreay
have a concept of NanoCPUs for tasks. The `--cpus` flag will translate
the number into reused `NanoCPUs` to be consistent.

This fix adds integration tests to cover the changes.

Related docs (`docker run` and Remote APIs) have been updated.

This fix fixes 27921.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d93d09acaa
Component: cli
2017-06-02 00:10:32 +00:00
0ce8491828 daemon: add a flag to override the default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9ba2472a0b
Component: cli
2017-06-02 00:10:32 +00:00
8bc7f37f93 project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b823284d4a
Component: cli
2017-06-02 00:10:32 +00:00