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
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
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
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
a661737346
docs: change events --since to fit RFC3339Nano
...
PR6931 changed time format to RFC3339Nano.
But the example in cli.md does not changed.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
Upstream-commit: d619b5594ba136ab285b93128bbe8fe246678488
Component: engine
2015-02-02 22:39:03 +08: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
8d15c02d80
Merge pull request #10464 from johnktims/patch-1
...
Fix documentation typo
Upstream-commit: 74475325bce174032bff10db2e0d86bc96eaf3ab
Component: engine
2015-02-02 00:12:45 +01:00
df77a82c15
Update dockerfile_best-practices.md
...
Signed-off-by: Thell Fowler <Thell@tbfowler.name >
Upstream-commit: cb3be586d6fa9c504f8575a832b19e8e3b2e64c2
Component: engine
2015-01-31 11:02:09 -06:00
39a298fb43
Fix a tiny typo.
...
'saving', not 'saveing'
Signed-off-by: Yihang Ho <hoyihang5@gmail.com >
Upstream-commit: 50c3ffd00969f8b1f2a00849973f2587984a26bf
Component: engine
2015-02-01 00:37:27 +08:00
3abec8abd0
Fix documentation typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
Upstream-commit: 2f5919966af49cd530a60c01b21ddd00c888f207
Component: engine
2015-01-30 12:44:42 -05:00
db0b8845b9
Add missing $HOST in a couple places in HTTPS/TLS setup docs
...
Fix typos in setup docs where tcp://:2376 is used without the $HOST
parameter.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: 6a1da678de2150a0dcf943614b6c1a1a2012ab38
Component: engine
2015-01-30 11:20:50 -05:00
d68f0eed0e
Some small updates to the dev env docs.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 80b843b7313234f56ffd9881bd50a56d85b52e7f
Component: engine
2015-01-29 16:01:05 -08:00
569feae573
Merge pull request #10435 from SvenDowideit/add-dhe-placeholder-docs
...
DHE documentation placeholder and Navbar changes
Upstream-commit: c12fb48a8a7df71ec3b952800ead1f21aea9ada6
Component: engine
2015-01-29 10:23:57 -08:00
7d86677c51
Merge pull request #10293 from SvenDowideit/test-9952
...
comment out the docker and curl lines we'll run later
Upstream-commit: 5b9b5aff06aa0e2c8397ee4cfb62e7f1ea249e0e
Component: engine
2015-01-29 10:18:53 -08:00
dad1ed7610
Merge pull request #10428 from mehulkar/patch-1
...
Improve explanation of port mapping from containers
Upstream-commit: 9e10a888a3d4c804eb4a2aebcf0467b8ae0e4076
Component: engine
2015-01-29 10:07:24 -08:00
b5b158f395
Improve explanation of port mapping from containers
...
Signed-off-by: Mehul Kar <mehul.kar@gmail.com >
Upstream-commit: f1bc02e91f79b4a54f47e0ad4abfd3d48b698ec4
Component: engine
2015-01-29 09:09:44 -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
00303c7fa9
DHE documentation placeholder and Navbar changes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 0ce3a49d64bcfd81823fe0e9bf54c51ddf6e35d4
Component: engine
2015-01-29 20:50:43 +10:00
65b792b36b
Replace "base" with "ubuntu" in documentation
...
The API documentation uses the "base" image in various
places. The "base" image is deprecated and it is no longer
possible to download this image.
This changes the API documentation to use "ubuntu" in stead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c0969ed3d896c9add0a2cca7b9a9074cd138571b
Component: engine
2015-01-28 22:54:10 +01:00
15ba70ac25
Merge pull request #10408 from estesp/fix-ipv6-docs
...
Fix incorrect IPv6 addresses/subnet notations in docs
Upstream-commit: 8d49ebd3381af51370df346b797515b4a32ac153
Component: engine
2015-01-27 23:24:52 -05:00
937fb930a0
Fix incorrect IPv6 addresses/subnet notations in docs
...
Fixes a few typos in IPv6 addresses. Will make it easier for users who
actually try and copy/paste or use the example addresses directly.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 5945de43b02406dbc0eee44954eb21e5926bde00
Component: engine
2015-01-27 22:45:43 -05:00
b15db42113
Merge pull request #10374 from SvenDowideit/add-ip-range-for-webhooks
...
tell users they can what IP range Hub webhooks can come from so they can...
Upstream-commit: de52a1998dbec1b5a7f9e27bcf527971b8df3666
Component: engine
2015-01-28 11:55:09 +10:00
6813c73a03
Add the registry mirror document to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1d04cc513a958009131ca54bd6904be14fef774e
Component: engine
2015-01-28 10:47:11 +10:00
