Commit Graph

1636 Commits

Author SHA1 Message Date
beaedbfd4c Change single-dash flag usage to double-dash
The single-dash long-form flag usage is deprecated.

Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathanleclaire@gmail.com> (github: nathanleclaire)
Upstream-commit: e7babb28ccb2d451baec9a8cb83e627390cbcdd4
Component: engine
2014-05-21 17:07:04 -07:00
457c223488 Merge pull request #5920 from jmccrohan/master
docs: cli.md; document docker version output
Upstream-commit: bfe72c6189e92d9ee6f2d2f26a5553b4eb863a44
Component: engine
2014-05-19 21:41:05 -07:00
7428c89c95 docs: cli.md; document docker version output
Commit 3cec63d56f9de6332aa3f33502695283d4feb054 changed the output of
docker version. Updating docs accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 4052a81830e57c9f1d7d567ba9e53813945c9810
Component: engine
2014-05-20 02:00:31 +01:00
77c39f7b85 Merge pull request #5905 from jamtur01/faq
Adding the FAQ back
Upstream-commit: 5511be75127b84933d0f283b21dbd05a1b6edc33
Component: engine
2014-05-20 10:17:01 +10:00
5b3405364b Merge pull request #5880 from LK4D4/fix_uid_overflow_#5647
Check uid ranges
Upstream-commit: 66e7cf24b754b9de441669c50b37801706c0a557
Component: engine
2014-05-19 09:55:36 -07:00
85d37676ba Adding the FAQ back
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 702442b58696b1a77d9274c92000f6e0c0c983bb
Component: engine
2014-05-19 10:07:57 -04:00
5fad0a836d Merge pull request #5884 from brandon-rhodes/master
Expand the Advanced Networking page to all options
Upstream-commit: e5422e212f7929207b5df891b3358995755b0e80
Component: engine
2014-05-19 03:35:48 -04:00
059730a575 Merge pull request #5834 from waitingkuo/patch-1
Update ubuntulinux.md
Upstream-commit: 59e37784ee3c2235b0e5919b5dca8f3c2a4c0b66
Component: engine
2014-05-19 03:34:14 -04:00
399e34e6ec Expand the Advanced Networking page to all options
For issue #5658 this rewrite of the networking page explains what every
single option (unless I missed one!) does both for the Docker server and
also the Docker client when submitting a "docker run".  I somehow
thought that, when I was done, there would be a lot more about setting
up topologies like I did for my Foundations of Python Network
Programming network of Docker containers.  More about making routers and
firewalls that NAT and so forth.  But, at least for this draft, I think
that setting up subnets and setting up point-to-point links is most of
what Docker users will need unless they are doing something exotic.

We can always expand later.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md documentation per @jamtur01

Besides catching some typos and awkward sentences, @jamtur01 had several
more thorough changes to suggest:

 *  He illustrated the correct way to delimit "Note" paragraphs in
     Docker documentation.

 *  He helped point out where I was presuming an Ubuntu host running
    Docker, so that I could re-word those sections to be specific that
    the advice only applied to Ubuntu (these mostly related to how to
    set server-wide options and restart the server).

 *  He is happy to have "Ethernet" capitalized even where Linux
    documentation would render it with an ugly lower-case first letter.

Docker-DCO-1.1-Signed-off-by: Brandon Rhodes <brandon@rhodesmill.org> (github: brandon-rhodes)

Improve networking.md per ideas from @SvenDowideit

A response to a bit of further discussion of pull request #5884.
Upstream-commit: ca9c35cdf772ddb121447b3877dbcf8caa4c5cdb
Component: engine
2014-05-18 21:58:39 -04:00
a370795c17 Merge pull request #5883 from jamtur01/debianinst
Added basic Debian installation page
Upstream-commit: 3b96078856b935bf634eab0c4c449dce34cfdf7e
Component: engine
2014-05-18 19:02:48 -04:00
dc955f4ca7 Fixed sudo section to match Debian installation doc
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: f8974b5cfc87f7775019e3df2d09ad68f2119772
Component: engine
2014-05-18 18:55:58 -04:00
35afe10f75 Added basic Debian installation page
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 88afc8992f2ebd2fd95d87dfff720ff946183975
Component: engine
2014-05-18 18:55:36 -04:00
876c525e4c removing grep command that depends on perl, better for boot2docker
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com> (github: financeCoding)
Upstream-commit: 7f9178c6d15417ed8b32976b7ca075422c8160da
Component: engine
2014-05-18 10:02:39 -07:00
823bf4bfec Check uid ranges
Fixes #5647
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 72d1e40c4a3b190319cfa5cb44b5e6f1694100fc
Component: engine
2014-05-18 20:49:08 +04:00
fc1241ce1d Merge pull request #5882 from jamtur01/ubfix
Fixed description and keywords on Ubuntu installation docs
Upstream-commit: f65db7c565ed736e26fc9daa30b1bc526351e70b
Component: engine
2014-05-18 17:26:29 +01:00
3103867f6f command line nit
Upstream-commit: 21e36ab36cd0beb192ce95469639f659b4877641
Component: engine
2014-05-17 22:04:41 -07:00
d0caec517c Fixed description and keywords on Ubuntu installation docs
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a52db7d8802f3cfd8a88e1bcf0a25f59458f7558
Component: engine
2014-05-17 22:18:08 +02:00
96be0f9c84 Merge pull request #5832 from stevenburgess/documentation_cli_fix
Refactor b.tar -> busybox.tar
Upstream-commit: 4dabca90464f572f5a9ebeae3bdba8e77f6a353b
Component: engine
2014-05-17 09:42:20 +01:00
191900baf7 Update ubuntulinux.md
In Ubuntu 14.04, we should use

    $ sudo service docker.io restart

instead of

    $ sudo service docker restart
Upstream-commit: 1b4915c1a8ba4724edd4e7864e85ff4fb795d04f
Component: engine
2014-05-16 17:08:05 +08:00
811e26ec97 Refactor b.tar -> busybox.tar
The file was saved as busybox.tar, but the ls commands named it b.tar.

Docker-DCO-1.1-Signed-off-by: Steven Burgess <steven.a.burgess@hotmail.com> (github: stevenburgess)
Upstream-commit: ddb99054bc9c04cce4ca761f9f0d822d67d614c4
Component: engine
2014-05-15 22:33:28 -04:00
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