d918c4ba81
Add --filter scope=swarm|local for docker network ls
...
This fix tries to address the request in 31324 by adding
`--filter scope=swarm|local` for `docker network ls`.
As `docker network ls` has a `SCOPE` column by default,
it is natural to add the support of `--filter scope=swarm|local`.
This fix adds the `scope=swarm|local` support for
`docker network ls --filter`.
Related docs has been updated.
Additional unit test cases have been added.
This fix fixes 31324.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 704ea8f6b4ad6f43c348affe357994d440aaf3de
Component: engine
2017-03-23 18:48:11 -07:00
65c978bb84
Merge pull request #31749 from yallop/docs-31047
...
Add documentation for bind mount consistency flags (#31047 ).
Upstream-commit: 94394026a8c6d99e13d7fb369698e2673ebfc722
Component: engine
2017-03-22 10:06:50 +01:00
1ec4220e3a
Add reference filter to the list of available filters
...
The `reference` filter is documented in the file, but is not present
in the list of available filters.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8e7e6bdb73fc050ca23a910b767fcb58197eed00
Component: engine
2017-03-21 16:11:11 +01:00
260796fd5f
Documentation for bind mount consistency flags.
...
Signed-off-by: Jeremy Yallop <yallop@docker.com >
Upstream-commit: 1a710c16600c76ec62ff468f99534e3779efa4a7
Component: engine
2017-03-21 11:55:33 +00:00
ff11389227
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
2017-03-13 17:52:08 -07:00
e14af410b8
Merge pull request #31198 from docbobo/master-manpages-aarch64
...
Improved aarch64 build
Upstream-commit: 7bf408526442a9561f742992d26d730aea891958
Component: engine
2017-03-07 13:53:48 +01:00
47709fd338
Merge pull request #31083 from xulike666/fight-for-readability
...
fix some typos from module contrib to man
Upstream-commit: 57fd478169071b09f0e6657cc1c2568d80c1bed3
Component: engine
2017-03-03 15:13:01 +01:00
8bdc10bd7a
Incorporated feedback from review
...
Signed-off-by: Boris Pruessmann <boris@pruessmann.org >
Upstream-commit: ea70c9f596bb5cb523ce8baa4bf8caf53efd90bc
Component: engine
2017-03-01 20:27:53 +01:00
12aa0347d6
Merge pull request #30383 from TDAbboud/30096-add-host-docker-build
...
Add --add-host for docker build
Upstream-commit: a64ea37753fd9a94dfa3ab81f67f46df7bd641f8
Component: engine
2017-02-27 12:42:18 +01:00
c6ebb9e13b
Improved aarch64 build
...
- Added 'golint', 'yamllint', and 'swagger'
- Fixed man/Dockerfile.aarch64 by bootstrapping Go 1.7.5
Signed-off-by: Boris Pruessmann <boris@pruessmann.org >
Upstream-commit: cdf17e6943b15103b37fd57da7c2729a26ecb674
Component: engine
2017-02-23 10:51:27 +01:00
79d868fec9
Merge pull request #31031 from WeiZhang555/stats-all-docs
...
[Docs] Add docs for stating stopped containers
Upstream-commit: 4534dcd494979ea89d8243002fb478857e25032d
Component: engine
2017-02-22 11:14:15 +01:00
7dba33b4e7
Add --add-host for docker build
...
Signed-off-by: Tony Abboud <tdabboud@hotmail.com >
Upstream-commit: 7a962e4577628c357f96153eca07e527813fb42b
Component: engine
2017-02-20 17:32:28 -05:00
dbeb0f7f68
Fix whitespace error.
...
Signed-off-by: Andrew McDonnell <bugs@andrewmcdonnell.net >
Upstream-commit: 296c803d320fa941d8dd0dc5dc73b683486b6c92
Component: engine
2017-02-19 17:28:26 +10:30
cdf7829892
fix some typos from module contrib to man
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: e0577d5fe876ec92de21c808c31e97e052654223
Component: engine
2017-02-18 10:08:55 +08:00
29e3dcbbb0
why there are so many mistakes in our repo (up to /cmd)
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn >
Upstream-commit: f8a40477960976f12dbbb72e5b133b5b0f05f9b3
Component: engine
2017-02-17 00:32:48 +08:00
fea229adb1
[Docs] Add docs for stating stopped containers
...
This commit adds docs with example showing `docker stats` stopped
containers.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7a36d55a86e5d443f1de5b7b32d710cc65671a92
Component: engine
2017-02-15 14:20:30 +08:00
ec2663feb9
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
...
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 52379fa76dee07ca038624d639d9e14f4fb719ff
Component: engine
2017-02-13 11:01:54 -08:00
49889e6daa
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: 9fc393615f6aae1a70ba282123ee15afc23a6297
Component: engine
2017-02-07 08:24:46 -08:00
a0487c75eb
Merge pull request #30771 from tophj-ibm/fix-manpages-p-z
...
ppc64le and s390x fixes for manpages
Upstream-commit: 09e99ef1fcbbcb8f1551298244ad8ac214cf2625
Component: engine
2017-02-06 21:53:19 -08:00
1c501e8036
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: 5bec1b686481244698474a0103c0994b25c5c79c
Component: engine
2017-02-06 17:51:37 -05:00
b6e3ac9b99
remove musl-dev in man/Dockerfile.armhf
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 1c7a66eda768dcdcc210c7c43d80770bfb59b435
Component: engine
2017-02-06 13:32:21 -08:00
daca41d5ee
use precompiled go from google, needs debian to work
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: a6886bfc5253453b79cdddd7f8412b29356fd02b
Component: engine
2017-02-06 11:29:25 -08:00
8dc75c5438
from golang:1.7.5-alpine for docker-manpage-dev
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 7b52ec5f103bc026b47e58f2c4dfe46b9bd83c32
Component: engine
2017-02-05 22:40:57 -08:00
6c5ae655f2
Merge pull request #30645 from yongtang/02012017-man-plugin-ls
...
Add markdown for man page of `docker plugin ls`
Upstream-commit: c6a3ed39f5d48db5d0d834e05741223cbebc12c4
Component: engine
2017-02-02 10:42:31 +01:00
b8779a3770
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: 6c27237f766665142b477083690450e0c745584e
Component: engine
2017-02-01 18:34:55 -08:00
84a7718751
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: 8ee9c635b245941f50f470e7b80f03fbcdf77ed7
Component: engine
2017-02-01 18:28:16 -08:00
ba31fcddc2
Merge pull request #29692 from yongtang/29492-daemon-shm-size
...
Add daemon option `--default-shm-size`
Upstream-commit: 354bd4aaddc3072dbe9ead45b22a1eaccda6a506
Component: engine
2017-02-01 16:56:10 +01:00
313335dc3d
Merge pull request #22563 from mlaventure/cgroup-devices
...
Allow adding rules to cgroup devices.allow on container create/run
Upstream-commit: 27f90acd61f4937f1f722082793e806261e527f7
Component: engine
2017-02-01 16:29:34 +01:00
b4140d991e
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: db575ef626e8b2660750cbede6b19e951a3b4341
Component: engine
2017-01-27 12:17:06 -08:00
c15d01d9ac
Merge pull request #29830 from timthelion/issue29821
...
Docs: Be more clear when specifying valid formats for strings
Upstream-commit: effc91e7a54a44b50913e1c17a8d173656411847
Component: engine
2017-01-26 10:45:03 -08:00
b9fbc9acb2
Add example for device-cgroup-rule to man
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: fc2fc6565a370c8403734254f2197081046704dd
Component: engine
2017-01-26 07:21:50 -08:00
b35799c15f
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: 1756af6fafabd9197feb56c0324e49dd7d30b11f
Component: engine
2017-01-26 07:20:45 -08:00
ea8da37d2a
Add docs for run|create --init|--init-path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d049ef2b0db4aebfba4f85f5d8294e9884a4b7e2
Component: engine
2017-01-19 08:47:01 -08:00
c5380c7534
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: fca6cda4b0307d1268e684dde65e6a916d729d04
Component: engine
2017-01-13 13:58:25 +00:00
afa2fae81f
Fix incorrect alias and URL
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9c0b3e1650ffe6f85376e1399a304204539d2495
Component: engine
2017-01-09 20:14:48 +08:00
a6a7d0048a
Merge pull request #29741 from yuexiao-wang/update-option
...
keep network options consistent between network connect and run
Upstream-commit: ee9bb347a678640a5305314eca99870971c1fc65
Component: engine
2017-01-06 19:01:48 +01:00
97d6813cf8
Provide correct command imformation and URL
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d8e6241989cdfda4513dd30faef00f1f71afa489
Component: engine
2017-01-06 11:02:02 +08:00
47aebadce2
keep network option consistent between network connect and run
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 4f9b076e8eecb19083b3875b7cacbc3b660fde75
Component: engine
2017-01-04 19:54:03 +08:00
17d62dfc95
replace no-remove by sample-volume-plugin in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bcead9282e17f51b01c4edfa59221546f02aaa33
Component: engine
2017-01-03 16:03:48 -08:00
91215c83ce
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: b71b4e1fb9aac5215aff7ce87e1bbb4010054ecd
Component: engine
2017-01-03 21:40:50 +01:00
681436c413
Read long description from a file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 78101b26afe4f7edbc4218d49238044e3feef54b
Component: engine
2016-12-28 16:08:23 -05:00
44db4994e4
Merge pull request #29648 from yuexiao-wang/fix-man-docker
...
Update the manuals of docker and dockerd
Upstream-commit: e3000a4e2f24a061d54cf135196a72c8d767a9a0
Component: engine
2016-12-27 12:13:20 +01:00
555eaa232b
Update the manuals of docker and dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b3e14c25f2926bde61ead09cbe40fd549f76ab75
Component: engine
2016-12-26 18:22:31 +08:00
5ef85a095b
Merge pull request #29500 from WeiZhang555/add-missing-flag
...
Add missing "--default-runtime" flag in manpage
Upstream-commit: a8bcef6fddb21e7edcf1050631dfd8e6491297ae
Component: engine
2016-12-22 16:22:53 +01:00
32a699cc17
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: 977fd439857006ab34deebac384b621bf4dae7da
Component: engine
2016-12-22 23:00:40 +08:00
4c53abe848
Clarify what docker diff shows
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 4497801c8a35ca2be9467419c5addff5166442d0
Component: engine
2016-12-20 17:03:11 -08:00
6bbfbe0423
Merge pull request #29393 from lixiaobing10051267/masterDockerUpdate
...
Add docker-update description ommitted in docker.1.md
Upstream-commit: 616adf1799af9a4815f74e39aabe4b2e352919c2
Component: engine
2016-12-19 10:17:14 +01:00
0bd3a53491
Add docker-update description ommited in docker.1.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: c499ce266a86aaf7d3d0e45bac8e833bad5df126
Component: engine
2016-12-19 15:13:51 +08:00
0fa3af8470
[docs,man] Fixed typo ( #29516 )
...
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de >
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
2016-12-18 19:55:09 -05:00
588ffd020c
Merge pull request #29434 from yuexiao-wang/pause-and-unpause
...
Fix inconsistency for pause and unpause
Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969
Component: engine
2016-12-16 16:42:04 +01:00
