Commit Graph

1616 Commits

Author SHA1 Message Date
98235fb032 Update the cli.md docs with the output of the docker command
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: d35330bb7aa8473b92f6f45718aa6c38863cccc7
Component: engine
2014-05-16 10:00:20 +10:00
4cab943cdb changed deprecated option styles to supported ones
-name and -rm to --name and --rm
Upstream-commit: 10a320818e875547c83fecea32cd73231248acf8
Component: engine
2014-05-15 10:50:59 -04:00
f038890332 docs: explain when RUN cache gets invalidated
This adds a few lines to the RUN Dockerfile docs to explain how to
bypass the RUN caching and how ADD can also invalidate the cache for
these instructions.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 239d1ef301eb8d9b2b1e8469489b25ff3708f47f
Component: engine
2014-05-15 12:32:01 +03:00
3f28a1f79c Merge pull request #5762 from SvenDowideit/pr_out_add_some_more_specific_help_for_dockerfile_build_contexts
Add some more specific help for Dockerfile build contexts.
Upstream-commit: 8887e0063014228dbf3ff85083019adca4537ec0
Component: engine
2014-05-15 11:03:22 +10:00
e368cbc7ba Merge pull request #5800 from jamtur01/paras
Updated a bunch of formatting in the docs/sources/use files
Upstream-commit: db4d534b5b3697b5c72dd0e11f9ad343015815e4
Component: engine
2014-05-15 01:58:14 +02:00
d3d3386204 Add some more specific help for Dockerfile build contexts.
I've copy and pasted the error message so its googlable.

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: ed703fc8be652eee65319a774ffbe95a07a03242
Component: engine
2014-05-15 09:41:05 +10:00
696f897a6d Merge pull request #5801 from jamtur01/fixups
Minor fixups to the Docs README
Upstream-commit: d9e3d88082b86f5baa703587023ff7a960ebfda7
Component: engine
2014-05-15 09:38:52 +10:00
82867e529b Updated a bunch of formatting in the docs/sources/use files
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 2269472f3ad09de59ba15185b9558b91f1ecb0b5
Component: engine
2014-05-15 01:26:36 +02:00
77c903866a Merge pull request #5805 from joelhandwell/patch-2
changed deprecated -name option to --name
Upstream-commit: 343c24a5faa6b92897349eca212f04260a48886c
Component: engine
2014-05-14 22:09:17 +01:00
68f263f160 changed deprecated -name option to --name
changed deprecated -name option to --name
Upstream-commit: 2d622df835f8c80b213a68bbceef21fb003a9a6a
Component: engine
2014-05-14 16:24:08 -04:00
89b28579db changed deprecated -rm option to --rm
changed deprecated -rm option to --rm
Upstream-commit: 137f4b326ad1669cd562fa59d809f39d21b653fe
Component: engine
2014-05-14 16:22:38 -04:00
3cdf280b45 Minor fixups to the Docs README
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a50a46048b8853ddfdac6f000ece86f95229dfea
Component: engine
2014-05-14 20:14:06 +02:00
750dbc4d7c Merge pull request #5787 from SvenDowideit/pr_out_add_a_mention_of_80_column_lines_and_reflow_the_document_to_hide_the_evidence
Add a mention of 80 column lines and reflow the document to hide the evidence.
Upstream-commit: d9b1c1976ff7343a04c030399ef879430e78226b
Component: engine
2014-05-14 20:13:48 +02:00
07e7377c7d Merge pull request #5758 from crosbymichael/add-cpuset
Add cpuset cpus support for docker
Upstream-commit: fc82199d4f013bedeee3793bcca61c9e554b0357
Component: engine
2014-05-14 20:57:12 +03:00
4926e35bb1 Add cpuset cpus support for docker
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: adbe3096e8c8572925dbae5f19ac2ce2dc84fb1c
Component: engine
2014-05-13 18:17:12 -07:00
40fe9434ea Add a mention of 80 column lines and reflow the document to hide the
evidence.

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 195f3a3f42ac8894ade9e3dbf8f02945781b6ace
Component: engine
2014-05-14 10:22:55 +10:00
eb9c7bf12e Subject and object containers can be confused
and `create` is now a loaded word for some readers

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: af891a67516149c4db490018430114c137cba9db
Component: engine
2014-05-14 07:43:41 +10:00
48f6f4f0d1 Merge pull request #5745 from ojilles/patch-1
Cleaned up Network settings overview
Upstream-commit: a70bffd382e26342dfe26d6bb8ca39ee7f498f33
Component: engine
2014-05-13 19:02:18 +10:00
4502be2717 Was checking something for a PR and noticed some quote issues
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b9c2d57d890c0f6a798baf74f7b56793fdf1fd61
Component: engine
2014-05-13 10:36:19 +10:00
5bdee3011a runmetrics update, linking to collectd plugin rather than just hinting
Upstream-commit: 79f234e049c72e0cac97bbd93815f33a919eaf1b
Component: engine
2014-05-12 20:51:40 +02:00
8c86f99ef3 Cleaned up Network settings overview
Upstream-commit: feb42d3f97f3a4de9317f17297c6277fcb0cc2af
Component: engine
2014-05-12 20:35:18 +02:00
8cb5d72505 Merge pull request #5621 from ostezer/docs-add-pardot
Add code for Pardot implementation to docs
Upstream-commit: 27a39bfd1a45e94e3935f9b57db2c072db27ce2c
Component: engine
2014-05-12 09:18:12 -07:00
5a665531c0 Merge pull request #5731 from SvenDowideit/reduce-cache-max-age
reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Upstream-commit: 0f88dbd7447f0c21853549c2a496cd1601678795
Component: engine
2014-05-12 17:05:55 +01:00
a0faa3873c reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 1dec8fd03c4f9c99491d3019f56772cccaf100fd
Component: engine
2014-05-12 11:31:44 +10:00
57c8245b81 Give the Redirect a HostName - filled in from the s3 bucket name.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0d59cc080a8dc115bdb727d376e3965e58109718
Component: engine
2014-05-12 10:31:27 +10:00
c589c9a2f3 Added value format description for VOLUME instruction
In the documentation was not mentioned explicitly that VOLUME value
shoud be a valid JSON array. Because of this I spent time to discovering
the problem with my image where I put `VOLUME ['/data']` (with single quotes).
The `['/data']` mount point was parsed and mounted whole as a string without
any errors and warnings.

Docker-DCO-1.1-Signed-off-by: Max Shytikov <mshytikov@gmail.com> (github: mshytikov)
Upstream-commit: b5a37127aadbefea937346846116cb93966798dd
Component: engine
2014-05-09 16:37:55 +02:00
b432390cfc Merge pull request #5583 from ostezer/docs-ui-add-codeblock-scrolling
Introduce x-axe scrolling to code-blocks.
Upstream-commit: 79dc316a86402882faffd88128ee56633e3eccc9
Component: engine
2014-05-09 10:31:52 +02:00
63756f9b02 Merge pull request #5599 from ostezer/docs-rewrite-examples-mongodb
Rewrite and update the MongoDB service article
Upstream-commit: 12201e2ea34148276bd7cf287e6171c0a40b5aff
Component: engine
2014-05-09 10:25:37 +02:00
719c55d2d0 Rewrite and update the MongoDB service article
MongoDB article had some fundemental issues.

 - Outdated Dockerfile
 - Insufficient / unclear instructions
 - Unnecessary comments
 - Failed to explain the role of Docker.io
 - Did not have a complete Dockerfile sample
 - Lacked a "learn more" section / link to Trusted Builds

This update aims to address all these issues with a complete re-write.

It also:

 - Corrects the label under which this article is/was listed on the menu

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

 - First run at amending after the initial review process.
 - Make the Dockerfile generic.
 - Revision.
 - Fixes
Upstream-commit: fd5672349490f9cd18933a2508e1890c9e026af5
Component: engine
2014-05-09 09:09:52 +01:00
ae9f35caf2 Merge pull request #5678 from MasonM/patch-2
Fix link to daemon/execdriver/lxc/lxc_template.go
Upstream-commit: 2463849ecf2bc9812a4be4bbb10855c489ae9a65
Component: engine
2014-05-09 09:41:47 +02:00
3b9e92a12c make higher level heading specify that instructions are for manual install
Docker-DCO-1.1-Signed-off-by: Benjamin Atkin <ben@benatkin.com> (github: benatkin)
Upstream-commit: ca33d2589f69381719b456352fdaaaa3fe54d5ac
Component: engine
2014-05-08 22:57:04 -07:00
ff4347f669 Fixed typo in docs - intro - working with docker - working with images. It read that you can use both images used by others and images used by others, in a run-on sentence.
Upstream-commit: ea049a2ebc072819920c42140221ce4ab7bab22e
Component: engine
2014-05-08 10:05:00 -07:00
960115467c Fix link to daemon/execdriver/lxc/lxc_template.go
Upstream-commit: 5d39175c22b01cb31ebabb0c52de913a5541cd8b
Component: engine
2014-05-08 12:49:50 -04:00
b4dfa516c6 The Go template is a better pattern for documentation.
Upstream-commit: 7549199cc5e1de910f5dbd539831095739524ea6
Component: engine
2014-05-07 00:21:02 -07:00
9f2043420a update the docs to reflect the nice \n handling
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: cfb232cff27da2dd46ec04a5bf6699ab1d1df91c
Component: engine
2014-05-07 09:40:49 +10:00
49adbc4838 Merge pull request #5622 from SvenDowideit/net-host-docs
Update the run --net cli help to include the 'host' option
Upstream-commit: d7166536e7f71ca87a8c37d2eb1c06184c9f3bd6
Component: engine
2014-05-07 07:11:41 +10:00
670dbc4add Merge pull request #5616 from nirvdrum/patch-2
Use the contraction for "it is."
Upstream-commit: ba6a732357ce9e2fa3292ce8b46d17dadfe22468
Component: engine
2014-05-06 11:33:41 +01:00
65cf6af87c Update the run --net cli help to include the 'host' option
and then add that to the run and cli docs

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 9eeff6d099a951c3a3e45d63ce2f8cb158aaeb6c
Component: engine
2014-05-06 20:26:44 +10:00
a16e59966d Add code for Pardot implementation to docs
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 02f95a089cd4f9ff7d8e5ba9c7780607dac78d14
Component: engine
2014-05-06 09:53:19 +01:00
1d128ba235 add linked containers to hosts file
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Tested-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 53f38a14cd6b61a6b5df68cc3694dcba2b0c1eb7
Component: engine
2014-05-05 19:40:27 -07:00
e892d9d992 Use the correct "it's."
Upstream-commit: 2b0f88383afba28fe7b0bba989d115c2f5e2cc87
Component: engine
2014-05-05 20:08:35 -04:00
80dddf62f3 Merge pull request #5597 from jamtur01/docs-simplify-osx-install
Fixed the horrible OSX installation docs
Upstream-commit: df5827dd02f115811ba82bf8ae979ada292967f5
Component: engine
2014-05-06 08:55:14 +10:00
d5f89ec02b Merge pull request #4441 from crosbymichael/add-net-flag
Add --net flag to docker run and allow host network stack
Upstream-commit: 70fef1460a9d253bdf164d70d7057ec4ee497e08
Component: engine
2014-05-05 13:54:55 -07:00
dae2f35ca5 It's its.
Upstream-commit: b25208ee3e4d652d8b1f86ffac343b718118b745
Component: engine
2014-05-05 15:43:11 -04:00
eebd02a00b Merge pull request #5569 from vieux/add__ping_to_the_API
Add  ping to the api
Upstream-commit: f369278725a2c31f5fa2ba2da33ad513f54a5897
Component: engine
2014-05-05 10:09:31 -07:00
ab8f143867 Add docs for --net flag
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c1c6b3ccd915084bc9472992afa16f677a074785
Component: engine
2014-05-05 10:08:59 -07:00
a347ba17b5 Fixed the horrible OSX installation docs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: c34bb099e51300f4355f949cc514bab8370c82c1
Component: engine
2014-05-05 17:02:03 +02:00
339b3d71d5 Merge pull request #5592 from SvenDowideit/docs-simplify-osx-install
Several OSX install reader issues fixed
Upstream-commit: 30d458c53414e6b55506c5fa841a0cac7c8c64d4
Component: engine
2014-05-05 16:46:03 +02:00
7225779c77 Several reader issues fixed
- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 56d71ae79bbbdd0d1eb97408c6132687a33ec113
Component: engine
2014-05-05 22:52:12 +10:00
1d1a0132b4 Rearrange the existing info a little, and add example style guide
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 46755dfc1aa30a418a11dc8e352c600ef365b969
Component: engine
2014-05-05 22:18:12 +10:00