d411e5860d
docs: add See Also for description of login/logout and start/stop
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: 41dc0e08d3f77b334670cc2ff3fb1a0c16fd9300
Component: engine
2015-03-01 01:36:00 -05:00
0c7bf5829a
Merge pull request #10940 from 1HLtd/master
...
docs/man/docker.1.md: spelling mistake fix
Upstream-commit: f8dbcdc5994a300308f4d259c62b58974a25e028
Component: engine
2015-02-25 20:45:46 -05:00
47a091cc6c
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
2015-02-25 13:46:18 -08:00
4e766f5eaa
pass --change changes to the import job
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
2015-02-24 13:01:36 -05:00
2bc83bf87b
add docs for commit --change
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com > (github: dqminh)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 5767548fa79342cee94dbb66b9c41671d4a1879f
Component: engine
2015-02-24 13:01:36 -05:00
848426a114
Implements stats for lxc driver
...
Implements stats and fixes stats test.
Signed-off-by: Abin Shahab <ashahab@altiscale.com > (github: ashahab-altiscale)
Upstream-commit: 1a26ed09ee6199341297f5e5ef8c5ed30efb6596
Component: engine
2015-02-23 10:16:52 +00:00
0e698514b4
docs/man/docker.1.md: spelling mistake fix
...
Signed-off-by: Marian Marinov <mm@yuhu.biz >
Upstream-commit: 811132f4b95817b26d28c5e182d3f6f6d62f45bf
Component: engine
2015-02-22 22:47:22 +02:00
299b14d7b4
Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
...
Added missing documentation for PR #8543
Upstream-commit: 573e2484a5017385d645a11de29f9c9e7e207c5b
Component: engine
2015-02-19 17:19:09 -08:00
d5362cffa1
Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
...
Allow docker pause and unpause to accept multiple containers
Upstream-commit: 934535db9c78b20481c8ccabdf174926c6e04d4d
Component: engine
2015-02-19 15:16:05 -08:00
caf4b888be
Added missing documentation for PR #8543
...
Added more examples and functionalities for docker ps documentation
Signed-off-by: André Martins <martins@noironetworks.com >
Upstream-commit: 401e93bbb9b4bd682234f0ebca59aa83bfbe3f2e
Component: engine
2015-02-19 22:05:14 +00:00
7eeecba437
Merge pull request #10619 from bcicen/add-logpath-to-inspect-container
...
Add logpath to inspect container
Upstream-commit: dc37358d8c9b177a050620731cf3b7f247a26f78
Component: engine
2015-02-19 12:56:45 -08:00
77b12b70c8
man page description for -c/--cpu-shares flag for docker run command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: c1deb7f524da94adc0f7dd3ddf4607bbb92b8d02
Component: engine
2015-02-18 14:01:55 -05:00
cc3ec80739
add logpath to docker inspect.
...
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com >
Upstream-commit: 06c01b02f5d8149407028324e751df5c0a92fd14
Component: engine
2015-02-18 10:19:52 -05:00
9067686a86
Merge pull request #10846 from chenhanxiao/pause-unpause-link
...
docs: add See also for description of pause and unpause
Upstream-commit: 6c4e1387d143f8f78738b9e54e7ea761588e3a62
Component: engine
2015-02-17 19:26:56 -05:00
ee82c91c8a
docs: add See Also for description of pause and unpause
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: a69b189fc5796248bedc01a9feb34da765c73547
Component: engine
2015-02-17 10:22:28 +08:00
bc6bb1e0e5
Merge pull request #10779 from duglin/10771-FixStatsHelp
...
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
2015-02-16 11:18:58 -08:00
564ab376d9
docs: fix a typo in Dockerfile.5.md
...
s/Exececutable/Executable
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: bfba622f86eb45e25d4ff6dc6808cd740bd2a671
Component: engine
2015-02-15 11:06:18 +08:00
79ea7dd989
Fix 'docker stats' help message
...
Closes #10771
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
2015-02-13 12:45:50 -08:00
b108618571
Cleans up docs/man/Dockerfile.5.md
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
2015-02-13 12:47:58 -05:00
2fcf439ff5
docs: fix a typo in Dockerfile.5.md
...
s/Mutliple/Multiple
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: c4340de04faec1b9d54da62a8a2174da4d6a301b
Component: engine
2015-02-07 17:09:20 +08:00
19b7fc9336
Fixes #10457-Pause-and-unpause-accept-multi-containers
...
Applied multi parameters to pause and unpause.
Created a new test file dedicated for pause commands.
Created a new utility function to get a slice of paused containers.
Updated documentation
Signed-off-by: André Martins <martins@noironetworks.com >
Upstream-commit: 0ce42dcc96d0f3bbfb89b23eb3c255d2ddaa9624
Component: engine
2015-02-07 00:28:49 +00:00
440786c4fd
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
Upstream-commit: e4a49ae1885a7f80e713d1d1fc852f6e4214dfe6
Component: engine
2015-02-06 14:35:45 -08:00
24564a4544
Merge pull request #10263 from hqhq/hq_check_memoryswap
...
add check for memoryswap
Upstream-commit: d1f18786ac009fedb716373ebc2ea6d646d3d8f2
Component: engine
2015-02-06 13:43:23 -08:00
8eee87ed67
Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
...
For now, docker stats appears to be libcontainer only
Upstream-commit: 68b0ed54cb7ed9e4b66e8a9e0708577b32088de2
Component: engine
2015-02-05 17:52:36 -08:00
a56a6166e9
update docs for memory and memoryswap
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 0c0f0d5ab41cae62a441502f26c1c300fc61e25d
Component: engine
2015-02-05 09:12:56 +08:00
a31c4ae7c4
Fix a small spelling error in the dm.blkdiscard docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Component: engine
2015-02-05 10:57:33 +10:00
13f79dd103
Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
...
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
Upstream-commit: 1cc774b4faebdc11f419add5467a6bc19288bce9
Component: engine
2015-02-05 10:21:00 +10:00
38af1c98bd
For now, docker stats appears to be libcontainer only
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 2507e0b64fc037a38bf48405b9a0cce1e56cb7c8
Component: engine
2015-02-05 10:12:05 +10:00
e0ba739be5
Docker attach documentation didn't make sense to me
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: e58fdaae056491207349df8747289ed52e04462a
Component: engine
2015-02-03 11:53:14 +10:00
1f18971794
Remove File List
...
This list is outdated. It could be updated instead of removed... but why should it be maintained? I do not see a reason.
Signed-off-by: João Bruni <contato@jbruni.com.br >
Upstream-commit: aceb735dbaa7845aeacfdaa62656de558554d8b7
Component: engine
2015-02-02 09:47:19 -02:00
ee0b731a9a
docs: fix another typo in docker-build man page
...
s/arbtrary/arbitrary
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: f0c9818eba0a9220766b020612f3b1d63c7d9c80
Component: engine
2015-02-02 10:39:28 +08:00
e7165e9c1d
Update events format in man page
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: f750f17451f7e36367c49f2e45c9fcc261a000cc
Component: engine
2015-01-29 15:18:25 -08:00
69b545f6ad
Merge pull request #10351 from duglin/FixDocsWorkdir
...
Fix docs so WORKDIR mentions it works for COPY and ADD too
Upstream-commit: ba8e1673ad81f97d836acfdacbed5f4c54a0ef68
Component: engine
2015-01-29 09:52:01 -05:00
f7f3e75906
Merge pull request #10373 from chenhanxiao/docker-build-typo
...
docs: fix a typo in docker-build man page
Upstream-commit: b2b284b5cdb1df2bbde896bff6dbbe87a8853a71
Component: engine
2015-01-27 18:25:55 -05:00
bdc325d2e4
docs: fix a typo in docker-build man page
...
s/Dockefile/Dockerfile
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: dcfa881a7b12e9a737b25ada98ec0c76e58c9c9c
Component: engine
2015-01-27 11:19:02 +08:00
a4bc7ec4fb
Fix docs so WORKDIR mentions it works for COPY and ADD too
...
The docs around COPY/ADD already mentioned that it will do a relative
copy/add based on WORKDIR, so that part is already ok. Just needed to
tweak the WORKDIR section since w/o mentioning COPY/ADD it can be misleading.
Noticed by @phemmer
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f709da192cda47c9aaaa212b03442d4f28afdb97
Component: engine
2015-01-26 17:13:44 -08:00
193affd9cc
Fix a minor typo
...
Docker inspect can also be used on images, this patch fixed the
minor typo in file docker/flags.go and docs/man/docker.1.md
Signed-off-by: DiuDiugirl <sophia.wang@pku.edu.cn >
Upstream-commit: 471006c02f03d9451721dfbd7e3d62f0db0fc7c7
Component: engine
2015-01-24 15:08:33 +08:00
f0170e8737
Update to docker stats documentation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
2015-01-21 11:44:23 -08:00
6bc1b160e8
Exit cli when all containers when no more containers to monitor
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4b173199fde99a2b275421ed070b0ec004730e35
Component: engine
2015-01-21 08:55:23 -08:00
a77fb96f4c
Add documentation for stats feature
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
2015-01-20 20:21:47 -08:00
1c8677b886
Merge pull request #10206 from jfrazelle/add-docs-memory-swap
...
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
2015-01-20 18:20:13 -05:00
304cd59f67
Merge pull request #10135 from coolljt0725/update_link_docs
...
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
f4d05bcf4d
Merge pull request #10124 from duglin/Issue10034
...
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
2015-01-19 17:09:18 -08:00
3a60e835c5
Add docs for --memory-swap.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7bb4b56cf98662ef5f1deb64bdf8a120490bc258
Component: engine
2015-01-19 16:17:58 -08:00
1a5071a250
Merge pull request #9826 from icecrime/8318_whitespace_add_copy
...
Support whitespace in paths for ADD and COPY
Upstream-commit: 50ff27caa13b4c558b0ddc9f65297b6ef6eb119d
Component: engine
2015-01-19 18:37:53 -05:00
9f931ee8fa
Update the docs for --link accept container id
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
2015-01-19 09:57:44 +08:00
611f8510fe
Merge pull request #9941 from SvenDowideit/build-pull-option-docs
...
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
2015-01-16 13:49:56 -08:00
8333dd3c16
Merge pull request #9840 from nhsiehgit/searchapidocs
...
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
468fbf0066
Add the list of possible values for --log-level to help text
...
Closes #10034
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ed13110e88846694a675696c161ce6456402f3ef
Component: engine
2015-01-15 12:20:41 -08:00
792af8c0a5
Add build --pull and evenets --filter flags to the docs for 1.4
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
