Zhang Wei
977fd43985
Add missing "--default-runtime" flag in manpage
...
Add missing flag and more descriptions in manpage.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-12-22 23:00:40 +08:00
Sebastiaan van Stijn
ba76c9214d
Merge pull request #29434 from yuexiao-wang/pause-and-unpause
...
Fix inconsistency for pause and unpause
2016-12-16 16:42:04 +01:00
yuexiao-wang
082f4919ca
Fix inconsistency for pause and unpause
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-16 17:27:28 +08:00
Harald Albers
7433d3acf6
Add docs for docker network create --attachable
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-14 08:39:10 -08:00
yuexiao-wang
303ff807f2
Update the manual for docker wait
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-14 18:22:59 +08:00
yuexiao-wang
b101e451f1
Fix the incorrect option name
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-14 04:10:09 +08:00
yuexiao-wang
cd317282c9
Update the option 'network' for docker build
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-13 18:18:53 +08:00
lixiaobing10051267
170fcead7e
add SCOPE field content for docker network ls
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-08 17:13:38 +08:00
lixiaobing10051267
576780369f
rectify several wrong URLs in branch of man
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-01 19:35:27 +08:00
Alexander Morozov
4b3740d009
Merge pull request #28978 from lixiaobing10051267/masterMan
...
modify some urls related to reference path
2016-11-30 12:04:00 -08:00
Alexander Morozov
caaa52c124
Merge pull request #28838 from AkihiroSuda/remove-run-mount
...
[Revert #26825 ] cli: remove `--mount` from `docker run`
2016-11-30 11:56:42 -08:00
lixiaobing10051267
b069690827
modify some urls related to reference path
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-30 16:48:39 +08:00
Vincent Demeester
60e72ea379
Merge pull request #28734 from ipbabble/master
...
Added and example of using --format with docker images
2016-11-28 20:57:13 +01:00
yupeng
6e1339bbc6
fix the mistake of present
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-26 17:11:19 +08:00
Akihiro Suda
e6d9b7de64
cli: remove --mount
from docker run
...
This commit reverts 273eeb813c
(#26825 ).
For the discussion so far, please refer to #28527 .
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-26 04:55:28 +00:00
Sebastiaan van Stijn
b3687bdcdc
Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc
...
28600: Docs: network connect for container in Created/Stopped state
2016-11-24 15:04:53 +01:00
dattatrayakumbhar04
16c9cdad6f
28600: Docs: network connect for container in Created/Stopped state
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
2016-11-23 20:20:37 +00:00
William Henry
798c00a7ee
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>
2016-11-23 10:15:19 -07:00
Vincent Demeester
d28eaa1171
Update docker info cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 17:20:12 +01:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:49:38 +00:00
Justin Cormack
b4e69fb3aa
Merge pull request #28580 from allencloud/fix-nits-in-error-message
...
fix typos
2016-11-18 13:18:23 +00:00
Vincent Demeester
6c447f552c
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
2016-11-18 13:02:40 +01:00
Boaz Shuster
039aca05c2
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-11-18 10:34:02 +02:00
allencloud
1f039a66ac
fix typo
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-18 15:51:36 +08:00
Vincent Demeester
947464e2f1
Update stats cli reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-16 15:26:29 +01:00
Vincent Demeester
cd2d52b5f6
Merge pull request #28316 from yongtang/28018-docker-info-swarm-managers-docs
...
Update docs for `docker info` for most recent changes.
2016-11-16 12:08:35 +01:00
Jonathan Boulle
ba408fbc9a
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>
2016-11-15 22:46:25 +09:00
Vincent Demeester
b6e1f11105
Merge pull request #28384 from bbayani/28295_live_restore_unsupported_win
...
Updated daemon documentation to clarify that live-restore is not supp…
2016-11-15 11:06:26 +01:00
bbayani
45bccaeacb
Updated daemon documentation to clarify that live-restore is not suppoted on windows
...
Review comment implementation
Signed-off-by: bbayani <bhumikabayani@gmail.com>
2016-11-15 07:07:43 +00:00
Jonathan Boulle
8eeaa25563
man page: consistent indents for flag descriptions
...
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
2016-11-15 14:59:47 +09:00
Yong Tang
d725764083
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>
2016-11-12 17:30:53 -08:00
Yong Tang
9b6b3c2076
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>
2016-11-09 12:13:25 -08:00
yupeng
c09277d5c3
Align arg with other cli
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-05 13:47:02 +08:00
Darren Stahl
4e15420b9b
Windows: Add cpu count option
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-04 13:38:50 -07:00
Yong Tang
846baf1fd3
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>
2016-11-04 09:43:10 -07:00
Justin Cormack
efa5e85cf7
Merge pull request #26276 from runcom/seccomp-conf
...
daemon: add a flag to override the default seccomp profile
2016-11-04 15:45:30 +00:00
Alexander Morozov
f2614f2107
project: use vndr for vendoring
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-11-03 15:31:46 -07:00
Akihiro Suda
273eeb813c
cli: add --mount
to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-03 07:08:59 +00:00
Antonio Murdaca
b237189e6c
daemon: add a flag to override the default seccomp profile
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-02 21:41:29 +01:00
Michael Crosby
22f3e43e9a
Merge pull request #22641 from cpuguy83/build_finalization
...
Adds ability to flatten image after build
2016-11-01 14:30:18 -07:00
Brian Goff
362369b4bb
Adds ability to squash image after build
...
Allow built images to be squash to scratch.
Squashing does not destroy any images or layers, and preserves the
build cache.
Introduce a new CLI argument --squash to docker build
Introduce a new param to the build API endpoint `squash`
Once the build is complete, docker creates a new image loading the diffs
from each layer into a single new layer and references all the parent's
layers.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-01 13:41:59 -04:00
Addam Hardy
f150f42009
Convert Unused ARG error to warning
...
Signed-off-by: Addam Hardy <addam.hardy@gmail.com>
2016-10-31 21:42:50 -05:00
Sebastiaan van Stijn
a13fc3fd36
Merge pull request #26683 from yuexiao-wang/update-inspect
...
Modify short and flags for docker inspect
2016-10-31 13:39:59 -07:00
yuexiao-wang
cc03984e17
Modify short and flags for docker inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-31 18:11:25 +08:00
Qiang Huang
e6866492c4
Fix bunch of typos
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-29 15:03:26 +08:00
Vincent Demeester
515e5dade7
Merge pull request #24698 from jhorwit2/jah/clist-health-filter-format
...
Fixes #24022 - Adds container health support to docker ps filter/format
2016-10-29 06:56:06 +02:00
Vincent Demeester
9ddbaddedc
Merge pull request #27851 from yuexiao-wang/add-format
...
Add --format to man and fix some typos
2016-10-28 23:58:20 +02:00
Vincent Demeester
7d1fa71675
Complete docker-events man page with filter list…
...
… and examples.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-10-28 13:07:00 -07:00
Josh Horwitz
1a149a0ea5
Adds container health support to docker ps filter
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-10-28 15:43:04 -04:00
yuexiao-wang
2d99344d3c
Add --format to man and fix some typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-28 22:31:20 +08:00