993f8d5799
Merge pull request #11235 from coolljt0725/fix_default_restart_name
...
Set default restart policy name to `no` Closes #10874
Upstream-commit: 7e47bb6effd1f076a78827543c4b4ce399c0ad1b
Component: engine
2015-03-10 12:12:40 -07:00
0199092cfa
Set default restart policy name to 'no' Closes #10874
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 311a600f1912c0d2a30becffdecde6026ada2624
Component: engine
2015-03-10 10:09:12 +08:00
e209023d26
Merge pull request #11227 from coolljt0725/fix_start_help_message
...
Fix docker start help message
Upstream-commit: b85c137f1d8c7d803653cab43c886a3c5d7e3f02
Component: engine
2015-03-09 09:54:36 -07:00
943c9020e9
Merge pull request #11177 from duglin/10805-cp-to-stdot
...
Add support for 'docker cp' to write to stdout
Upstream-commit: 8b516bf5ce85641095378ed8900aa63f0f32a619
Component: engine
2015-03-09 09:51:48 -07:00
a3b4760c40
Merge pull request #11146 from SvenDowideit/takeover-11126
...
fix to cpu.shares documentation by @hqhq
Upstream-commit: 08211aab57cf6891a845d8e7a7020e203ae2812d
Component: engine
2015-03-09 09:48:33 -07:00
143601c86b
Fix docker start help message
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3c37f88aff42c1d900d18d1a8c81fc857e650d44
Component: engine
2015-03-07 20:45:46 +08:00
f757146875
Merge pull request #11097 from thaJeztah/11069-run-reference-restart-policies
...
Docs: add restart-policies to 'Run reference'
Upstream-commit: faa6fd40f436587999e24b0f5c3369c007a6c482
Component: engine
2015-03-06 22:08:29 -08:00
6bfc416abd
docker info display http/https_proxy setting
...
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com >
Upstream-commit: 06a40f0f281b4679855a406bc202e122d2875949
Component: engine
2015-03-06 09:02:21 +08:00
312da52079
Add support for 'docker cp' to write to stdout
...
Closes #10805
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f3d96e81e9c2a738ec577b814092f8953932de3a
Component: engine
2015-03-05 15:22:08 -08:00
62e7b16446
Docs: add restart-policies to 'Run reference'
...
This moves some information on restart-policies from
the "command line" page to "run reference".
Also fixes some minor typos and adds a "NOTE"
about --rm and --restart not allowed to be combined.
Also removes inline CSS styles from tables,
which will be styled by the stylesheet, and fixes
some minor MarkDown errors (`<` -> <)
depends on https://github.com/docker/docs-base/pull/1
resolves #11069
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 8833779ae0384f3f9a995f94e42478451107a5ed
Component: engine
2015-03-05 01:13:53 +01:00
e3a22924ff
fix to cpu.shares documentation by @hqhq
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 26e5a9d76a802662bf287ce9de1f98988749636a
Component: engine
2015-03-04 13:13:22 -08:00
97033cc69f
Merge pull request #10586 from resouer/10532-fix-cors-hardcode
...
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
2015-03-04 18:42:20 +00:00
cd57675c32
Merge pull request #11134 from duglin/CheckMultiLineHelp
...
Fix 'docker ps --help' so the options don't span more than one line
Upstream-commit: ffc755ac14a49f41d0b27204b0a50034397c946e
Component: engine
2015-03-04 05:53:47 -08:00
36f1975bfd
Merge pull request #9437 from cpuguy83/set_rlimits_in_container
...
Allow setting ulimits for containers
Upstream-commit: df7ba57f5f962b1a2d2e267a89ae465541a92371
Component: engine
2015-03-04 04:00:17 -08:00
6827e12a3d
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
Upstream-commit: beea697be365631ceeb92761e094f1ffe307ca33
Component: engine
2015-03-04 03:52:49 -08:00
bc3e4a6737
Support dockerfile and Dockerfile
...
Closes #10807
Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 15924f238503ffe44e5fcb99415ff753a36e5971
Component: engine
2015-03-03 18:38:50 -08:00
72dd46b2de
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 93c82360a6b530ef86769ee04e027f6159dc55da
Component: engine
2015-03-03 13:58:35 -08:00
8c703a14a3
Fix 'docker ps --help' so the options don't span more than one line
...
and add a testcase to catch this in the future.
While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5595da2bde6574fe13785f07c55a155a2e90a7ca
Component: engine
2015-03-03 10:02:23 -08:00
f947fbc4ae
Add cors header flag and leave boolean flag not changed
...
Deprecate api-enable-cors
Update docs & man files
Signed-off-by: harry zhang <resouer@163.com >
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
2015-03-03 11:21:19 +08:00
4020847acb
Update cli.md
...
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.
Update dockerfile_best-practices.md
Fix typo in command name
Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com >
Upstream-commit: 39b3690ba1801b36c1f43fa220ae5128958a0739
Component: engine
2015-02-27 23:18:32 +03:00
5bd9f0f7c0
Merge pull request #10902 from estesp/10855-fix-add-host-doc
...
Correct --add-host documentation regarding host IP address retrieval
Upstream-commit: 94553f1ba6bd9f26059fc909586fd95230676432
Component: engine
2015-02-26 17:25:01 -08:00
2e0ec2c817
Allow setting ulimits for containers
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 3f39050637d454e9ee8075153a917c8bfccb5bae
Component: engine
2015-02-25 19:37:43 -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
9d92f5d059
Correct --add-host documentation regarding host IP address retrieval
...
Fixes: 10855
The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses. Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: f8a146311d1ea1645e25b38910b717335bb684c0
Component: engine
2015-02-25 09:56:58 -05: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
f3462cd410
Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
...
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
2015-02-23 15:26:53 -08:00
4fbdef753d
cli: Add server OS/Arch info to 'version' cmd
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 3346c2e4d9ce0cf92b056b6ddc883adf5b8beddd
Component: engine
2015-02-23 14:32:25 -08: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
85de285604
Remove CLI doc entry related to API-only function
...
Closes #10278
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4f0429621c7e6ccaac8bc9a62a703bf68f2d4cd4
Component: engine
2015-02-20 11:51:42 -05: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
b3d291c64f
Merge pull request #10835 from jfrazelle/port-ranges
...
Upstream-commit: 1875cc2ef42787375055710fc6b359ca3dd85752
Component: engine
2015-02-19 16:11:59 -05: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
ab127964ad
Shorten help messages for docker cmd flags
...
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 27a73a98b704b77eaa7c4caebfeaa84743969c67
Component: engine
2015-02-18 22:52:33 -08: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
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
0e5cf57545
Group published and exposed ports by contiguous ranges
...
Signed-off-by: Colm Hally <colmhally@gmail.com >
Upstream-commit: 5dfef4fe08b890022f600fe742e5a4372b023767
Component: engine
2015-02-16 10:52:23 -08:00
4a9bcf2320
Merge pull request #10571 from jfrazelle/8689-remove-all-aliases
...
Removes the feature to pull all image aliases.
Upstream-commit: 9ea20f260c0a31d6a0e939a099f7005e93507eea
Component: engine
2015-02-16 10:29:20 -08:00
7a0aaa5999
Use newer help out for 'docker' and 'docker run'
...
Closes #10828
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: effa5e2c18f27b81fc46d1a925d04e6af5695459
Component: engine
2015-02-16 08:46:07 -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
2c48e42531
Update docs for HTTP_PROXY
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
2015-02-12 11:40:56 -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
d10ffd08ef
Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
...
Documentation on boolean flags is wrong #10517
Upstream-commit: e706be77a46b11ed2202e226b10f547aa85a8a85
Component: engine
2015-02-06 15:12:11 -08:00
2d864c1626
Fix example about ps and linked containers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0f8f04a77492ddf37ca9c163ef0c3ddaf8a93a40
Component: engine
2015-02-06 14:05:08 -08:00
f3b4b47f92
Documentation on boolean flags is wrong #10517
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 1e6e68361c6cc42ab92288e0a0132b14ef6c9426
Component: engine
2015-02-06 19:52:01 +10: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
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
c75462bc54
Removes the feature to pull all image aliases.
...
It didn't work on v2 anyways. And an image with a lot of aliases was slow to
fetch.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Upstream-commit: 72a9000fcfa2ec5a2c4a29fb62a17c34e6dd186f
Component: engine
2015-02-04 15:06:34 -08:00
