d0465f42ac
Merge pull request #10651 from HammerOfThor/master
...
docs: fix a typo in registry_mirror.md
Upstream-commit: a98355561d23a6b02d5c8d8c94e6ff54866efabf
Component: engine
2015-02-09 05:05:57 -05:00
ce923ef765
Merge pull request #10624 from stevekochscience/master
...
Add link to user guide to end of 14.04 section
Upstream-commit: c28ea14bbb5c16cd69aee384d5261f6a53581741
Component: engine
2015-02-09 14:05:33 +10:00
a8cd8cc163
docs: fix a typo in registry_mirror.md
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 40486d97098a457bcafd20691ca28648f373a0dc
Component: engine
2015-02-09 10:04:55 +08:00
f77ee21d7f
Merge pull request #10635 from chenhanxiao/docs-Dockerfile-typo
...
docs: fix a typo in Dockerfile.5.md
Upstream-commit: a1eb2bebb812e22c05eeec057b63810b14f6a563
Component: engine
2015-02-09 09:50:18 +10:00
9851ff3c8f
Update certificates.md
...
`openssl req -new -x509 -text -key client.key -out client.cert` creates a self-sign certificate but not a certificate request.
Signed-off-by: Wei-Ting Kuo <waitingkuo0527@gmail.com >
Upstream-commit: 2f69da2a5ef77966a057ff139d442e9f14ca7083
Component: engine
2015-02-09 04:36:00 +08: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
6199c38a14
Merge pull request #10548 from SvenDowideit/add-webhook-image-list
...
The Hub build webhooks now list the images that have been built
Upstream-commit: 3807bd97777923cda57879d88e5779fe616191d2
Component: engine
2015-02-06 15:15:16 -08:00
b781d30f81
Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
...
Copy edit 10516 fedora install
Upstream-commit: dfa1a8493788e3d72eadcd11c221d05306fe9dd0
Component: engine
2015-02-06 15:14:31 -08: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
35392998b3
Merge pull request #10558 from gierschv/doc-remote-url
...
Documents build API "remote" parameter
Upstream-commit: c2f82bba0a7d365ae4712804d9aed50dff788898
Component: engine
2015-02-06 14:51:51 -08:00
72669b3feb
Add link to user guide to end of 14.04 section
...
Adding instructions to exit the test shell and a link to the user guide (as is done in the following sections for 12.04 and 13.04/10
Signed-off-by: Steven Koch <sjkoch@unm.edu >
Upstream-commit: 823cb1281060981a537b4d36315bf0a02074b2a2
Component: engine
2015-02-06 15:50:51 -07:00
4c675886ca
Merge pull request #10273 from kojiromike/patch-1
...
Distinguish ENV from setting environment inline
Upstream-commit: 7d4bbc2ed8305a730267e861bfe71ac7dbd3e373
Component: engine
2015-02-06 14:42:02 -08: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
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
a8eec7f547
Merge pull request #10605 from glasnt/readme_format
...
Format `awsconfig` sample config correctly
Upstream-commit: 2e947ae407252b9389ead7ee7d234bcfa6207342
Component: engine
2015-02-06 16:55:58 -05:00
225cdeb86f
Merge pull request #10611 from unclejack/systemd_doc_storage_path
...
docs/articles/systemd: correct --storage-driver
Upstream-commit: 9c63178e8678afb5d4f1305003d1dd01e4f3a43b
Component: engine
2015-02-06 16:52:28 -05: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
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
20a29795dd
Do some major rearranging of the fedora/centos/rhel installation docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: eb814e4e703b4676e0cb410052d1145ee9f8628e
Component: engine
2015-02-06 19:48:19 +10:00
f31f8c4059
update fedora docs to reflect latest rpm changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org >
Upstream-commit: 66839cf3a6718f844e71d2561cc706c95f5629ec
Component: engine
2015-02-06 19:48:19 +10:00
88b86ea3ea
Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
...
The reference menu is too big to list more than the latest API docs, so ...
Upstream-commit: 6081a3ca90f7994ae19d22009e3691de03afad14
Component: engine
2015-02-06 19:26:01 +10:00
cdd7eba595
docs/articles/systemd: correct --storage-driver
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 0b2f734462df3062acefe4bc4bd14d0604bae286
Component: engine
2015-02-06 10:52:09 +02:00
1cdd0ecffc
Format awsconfig sample config correctly
...
Reflow change in commit 195f3a3f removed newlines in the config format.
This change reverts the sample config to the original formatting, which
matches the actual config format of a `awsconfig` file.
Signed-off-by: Katie McLaughlin <katie@glasnt.com >
Upstream-commit: df3933621372e6f974801717cbb9fe3846efbfd6
Component: engine
2015-02-06 13:45:10 +11: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
9c086aa5c5
Merge pull request #10560 from MihaiB/docs-typo
...
docs: fix typo
Upstream-commit: eda9c14cb9d3bd6a99ea8badbdb0446cd4c1faf9
Component: engine
2015-02-06 00:42:45 +01:00
a99f7cd89b
Merge pull request #10521 from SvenDowideit/docs-not-ready-yet
...
remove swarm, machine and compose from the 1.5.0 release docs
Upstream-commit: abdfb21e3a761efdd70614de42905ff7911c5372
Component: engine
2015-02-05 03:42:14 +01:00
f4d8ef933c
Merge pull request #10575 from SvenDowideit/elide-dhe-docs
...
The DHE documentation will not be published with 1.5.0
Upstream-commit: e13a0de7aad0e38725868f8e12fc57cc73ed316f
Component: engine
2015-02-04 18:16:42 -08:00
7f4431424b
Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
...
Fix a small spelling error in the dm.blkdiscard docs
Upstream-commit: 6dd2364dc2c6ba0d95a5dc52dae447c80d9af5d0
Component: engine
2015-02-04 17:42:31 -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
e5fc776e72
Add an initial list of new features in Docker Engine 1.5.0
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 16a15ea5812e3dce0f23e1f4ac7ac576f45bfeb4
Component: engine
2015-02-05 10:37:15 +10:00
e0ecebf764
remove swarm, machine and compose from the 1.5.0 release docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: a7a9ce2635e75eb138fc761d8a5bba4156562a8c
Component: engine
2015-02-05 10:30:57 +10:00
b2714755f7
The DHE documentation will not be published with 1.5.0
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9867dfa6176c000f1afe25316f67f4d409b2b177
Component: engine
2015-02-05 10:26:53 +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
ccc7d51716
docs: fix typo
...
There are 2 not 3 RUN instructions in the userguide's Dockerfile.
Signed-off-by: Mihai Borobocea <MihaiBorobocea@gmail.com >
Upstream-commit: 48ee443ecaae002cc688c7b03e07ecc670b3b193
Component: engine
2015-02-04 23:15:18 +02:00
8423899da1
Merge pull request #10547 from duglin/Issue10214
...
Pretty the help text
Upstream-commit: a271eaeba224652e3a12af0287afbae6f82a9333
Component: engine
2015-02-04 11:31:18 -08:00
2ac3861c66
Merge pull request #10522 from SvenDowideit/fix-swarm-links
...
use the same paths as in the swarm repo, so that their links magically w...
Upstream-commit: 8a91926cd90b10e1be097eb2adb2ac58de1889a0
Component: engine
2015-02-04 10:19:19 -08:00
04baf7b642
Documents build API "remote" parameter
...
Introduced in Docker v0.4.5 / Remove API v1.1 (#848 ), the remote
parameter of the API method POST /build allows to specify a buildable
remote URL (HTTPS, HTTP or Git).
Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net >
Upstream-commit: 3cb78bfa76b2b4cc13d697ba6d0136465588828f
Component: engine
2015-02-04 17:07:56 +01:00
013dbb146f
Pretty the help text
...
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible
Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~
Applied rules/tests to all docker commands - not just main help text
Closes #10214
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 2203b37733e76d653cfe3b0ec5870786076adce7
Component: engine
2015-02-04 07:59:16 -08:00
41efd8d000
The Hub build webhooks now list the images that have been built
...
And fix some spelling - repo isn't really a word :)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 3166c4df835be40d438fd71bcb16de27c70a1246
Component: engine
2015-02-04 14:17:56 +10:00
e21086902c
Spelling mistake in dockerlinks
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ea6db8af18c9eee2147d78f987cdacacd37e93fb
Component: engine
2015-02-04 12:12:46 +10:00
7d32f56a80
Merge pull request #10507 from jbruni/patch-1
...
Remove File List
Upstream-commit: 165ea5c158cff3fc40d476ffe233a5ccc03e7d61
Component: engine
2015-02-03 17:33:15 -08:00
99f316a4fe
Merge pull request #10480 from yihangho/docstypo
...
Fix a tiny typo.
Upstream-commit: 0018afebb81365ed8920bbc7fe829a5bed744b81
Component: engine
2015-02-03 14:37:35 -08:00
ac0cbb6e4b
Merge pull request #10483 from Thell/master
...
Update dockerfile_best-practices.md
Upstream-commit: 71368c520eb4b1dc0f9ff5f5bd8cf599e1580e3a
Component: engine
2015-02-03 14:36:24 -08:00
3866315ae2
The reference menu is too big to list more than the latest API docs, so the others can be hidden - they're still linked from the API summary
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 072fbf92714e121f92b0599740444e4cc28c4fee
Component: engine
2015-02-03 14:04:08 +10:00
cfc914c811
use the same paths as in the swarm repo, so that their links magically work
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 1da2abb596178a3cb67ef83686f4425c31987640
Component: engine
2015-02-03 13:55:08 +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
94427ae72d
Merge pull request #10509 from chenhanxiao/cli-events-since
...
docs: change events --since to fit RFC3339Nano
Upstream-commit: 895f9a679ba66f3e531b87f5037db7664ceae2c1
Component: engine
2015-02-03 01:03:40 +01:00
ed0cd8ff3b
Distinguish ENV from setting environment inline
...
It's ambiguous to say that `ENV` is _functionally equivalent to prefixing the command with `<key>=<value>`_. `ENV` sets the environment for all future commands, but `RUN` can take chained commands like `RUN foo=bar bash -c 'echo $foo' && bash -c 'echo $foo $bar'`. Users with a solid understanding of `exec` may grok this without confusion, but less experienced users may need this distinction.
Signed-off-by: Michael A. Smith <msmith3@ebay.com >
Improve Environment Handling Descriptions
- Link `ENV` and `Environment Replacement`
- Improve side-effects of `ENV` text
- Rearrange avoiding side effects text
Signed-off-by: Michael A. Smith <msmith3@ebay.com >
Upstream-commit: 9f6e7e9aed85464651745090692317b30e4a3526
Component: engine
2015-02-02 14:55:25 -05:00
