Sven Dowideit
6a08eb7c32
Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images
...
docs/installation/google: update to use container-vm images
Upstream-commit: 8622641b585d18476f1bc26e1bb5d4298cecf78f
Component: engine
2014-05-29 11:41:43 +10:00
Johan Euphrosine
9e0e3e5d33
docs/installation/google: update to use container-vm images
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 456ba11d89b52f946d293489b52508a2e270f1a7
Component: engine
2014-05-29 11:36:28 +10:00
Robin Speekenbrink
62daf025f0
updated documentation for mentioning images vs containers
...
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl > (github: fruitl00p)
rebased by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: a0505edc9a890b3d4cdf5cf1850273c250c3dc41
Component: engine
2014-05-29 11:20:41 +10:00
Jérôme Petazzoni
8f1ec933f0
Replace 'private' with 'self-hosted' in a couple of places
...
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com > (github: jpetazzo)
Upstream-commit: b64535166f4e930121bf9cb624bf2d044c97e472
Component: engine
2014-05-27 18:57:25 -07:00
O.S. Tezer
a398a30f36
Merge pull request #6053 from jamtur01/produpdate
...
Removed Docker production warnings
Upstream-commit: d53eb2f67cbdd632d6e4cad8de9d8f654baa96a3
Component: engine
2014-05-27 18:00:49 -07:00
Sven Dowideit
f0d03df9d1
Merge pull request #6040 from SvenDowideit/installer-docs
...
Rewrite the mac and windows docs to use the boot2docker installers.
Upstream-commit: b76302e5d91da7b66fe0141f4a67636074c886a9
Component: engine
2014-05-28 07:57:43 +10:00
SvenDowideit
9f78769fba
Rewrite the mac and windows docs to use the boot2docker installers.
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5f5d66ade63f8040dd14114f2c7161b16a806c5c
Component: engine
2014-05-28 07:56:15 +10:00
Sven Dowideit
2d2f74e79d
Merge pull request #6005 from jimperrin/master
...
Updated documentation to include CentOS installation instructions.
Upstream-commit: 080d8a7a8367dcf7bdbcac00ec99fbfb05c7ab51
Component: engine
2014-05-28 07:55:03 +10:00
James Turnbull
de60cddde3
Removed Docker production warnings
...
* Removed warnings.
* Removed inconsistent Community installation sections.
* Fixed all installation page descriptions.
* Removed old .inc files.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 838e69e11e15dcf6cc1bc73f26602f814ce3698c
Component: engine
2014-05-27 13:08:19 -04:00
Jim Perrin
aef0b90283
Update documentation per suggestions from ostezer
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: b7e88250f421d34d25f89737c65954150248ee28
Component: engine
2014-05-27 08:59:30 -05:00
Thomas LEVEIL
94670aa7c3
Update ubuntulinux.md and debian.md
...
to add bash completion for the docker command
Upstream-commit: 250229605f895226fa868120f1a0ea7f4928bf8c
Component: engine
2014-05-27 14:17:01 +02:00
David Corking
7e9d849ecc
Update fedora.md
...
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
Upstream-commit: b26bebac318803d9dbcd908ccc3be4f2fb9a88b8
Component: engine
2014-05-26 12:29:27 +01:00
James Turnbull
feece77cd3
Merge pull request #6001 from jamtur01/introfixes
...
Some fixes to the Intro pages
Upstream-commit: 7393eafde79f67459755ef98d1718c25497783e3
Component: engine
2014-05-25 00:21:40 +10:00
James Turnbull
438f9224cd
Some fixes to the Intro pages
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 955bfda99a991e71af3352d18a007d39970cc508
Component: engine
2014-05-25 00:20:59 +10:00
Jim Perrin
584879665e
Correct appearance of shell output
...
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: 1cb2570a276020749a0b87444b17f4e6ce78b92d
Component: engine
2014-05-24 08:33:41 -05:00
Sven Dowideit
13006b0ee7
Merge pull request #6006 from therealprologic/master
...
Updated installation docs for CRUX as a Docker Host.
Upstream-commit: 22777fbc1e5439883d2e1d5e4fa0e004ea9f4289
Component: engine
2014-05-24 16:08:14 +10:00
Sven Dowideit
dd4e9e1b3f
Merge pull request #6016 from ronsmits/patch-1
...
Update using_supervisord.md
Upstream-commit: d81912e32313a33cb3ad9c1670e7d61effc9517b
Component: engine
2014-05-24 16:07:32 +10:00
Johan Euphrosine
c6fc71df20
docs/reference/builder: fix USER doc
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e89cb9a5e0105afbb0c1ba1176bda07d110295bc
Component: engine
2014-05-23 17:20:15 -07:00
Ron Smits
4ce695adff
Update using_supervisord.md
...
changed the version of ubuntu to 13.04. In latest sshd will not work.
Upstream-commit: 9429fe6f49a4396cdd0ab2f0b88240ff0239a070
Component: engine
2014-05-23 21:15:44 +02:00
Nathan LeClaire
2c5a72f5fe
Fix a few issues.
...
-single-dash => --double-dash for a few flags, and also there was a missing "B", as in "Container B".
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
Upstream-commit: 1e74cd0e01009bfa8afb6058f748f282da5200d0
Component: engine
2014-05-23 09:36:27 -07:00
Jim Perrin
ff0983f32e
Squashed for pull request
...
Updated documentation to include CentOS installation instructions.
Extraneous line removal, description change
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org > (github: jimperrin)
Upstream-commit: 2a35e41a9c825b6891440015ae95633fb84b9604
Component: engine
2014-05-23 10:46:01 -05:00
James Mills
c375228771
Updated installation docs for CRUX as a Docker Host.
...
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au > (github: therealprologic)
Upstream-commit: c0529e5fc1a50f6fff47646bcc2461aeef20f906
Component: engine
2014-05-24 01:18:00 +10:00
James Turnbull
1a0d737a90
Merge pull request #5949 from nathanleclaire/patch-1
...
Change single-dash flag usage to double-dash
Upstream-commit: a6577708abc9370cfe7603a543eb68ad0e37d7e3
Component: engine
2014-05-23 13:43:23 +10:00
Michael Crosby
456a42e6c9
Merge pull request #5839 from unclejack/improve_build_rm
...
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
2014-05-22 10:54:05 -07:00
James Turnbull
8eeac92781
Merge pull request #5746 from ImJasonH/patch-1
...
Update google.md
Upstream-commit: 7470ebf30b8b8bce03ae536cebbae71bfbe474f9
Component: engine
2014-05-22 13:43:40 +10:00
James Turnbull
0574a90328
Merge pull request #5982 from jamtur01/bitbucket
...
Added BitBucket support to documentation
Upstream-commit: 2fec15cff181775ffc86bd3def69ed41de917367
Component: engine
2014-05-22 11:35:17 +10:00
Nathan LeClaire
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
James Turnbull
f57c9e34ac
Merge pull request #5959 from tpng/patch-1
...
Add instructions for persisting data
Upstream-commit: cd44cd26cbea8837a29e133be6d4fd194f51d39c
Component: engine
2014-05-22 09:55:05 +10:00
Sven Dowideit
26f3790636
Merge pull request #5897 from jamtur01/newintro
...
Rewrite of the Introduction documentation
Upstream-commit: a0260c1181779365a924c913b8e886119d055cf9
Component: engine
2014-05-21 16:53:03 -07:00
James Turnbull
9eed719a4d
Added BitBucket support to documentation
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 62468a3eba4d115c16388fb4f67d6adfe4bbb0fc
Component: engine
2014-05-22 08:35:10 +10:00
James Turnbull
4f4d0b0064
Rewrite of the Introduction documentation
...
1. Re-aligns the introduction with the new product positioning.
2. Cleanup of some issues with language and formatting.
3. Makes the introduction leaner and meaner.
4. Responds to feedback from product.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 0056884090726f736af2594b09aaa44e373a84d1
Component: engine
2014-05-22 07:11:43 +10:00
Tibor Vass
1e7aa2e3c4
remove chmod 755: fixes #5941
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 56a53c72d285b3f9fa6b34dcb81c9720a1974bde
Component: engine
2014-05-21 11:35:08 -07:00
Brian Goff
a2fa77b792
Fixes some docs issues with using single-dash arguments where they should be double
...
I found a bunch of issues where we have "-<opt>" instead of "--<opt>".
Also a couple of other issues, like "-notrunc", which is now "--no-trunc"
Fixes #5963
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 6d9e64b27bbee9bb699ebc0f0ff98bb7f56961b3
Component: engine
2014-05-21 09:35:22 -04:00
tpng
96096d6c1f
Add instructions for persisting data
...
Docker-DCO-1.1-Signed-off-by: Benny Ng <benny.tpng@gmail.com > (github: tpng)
Upstream-commit: accea18920e856fc1099d85a3fced06dc7b53799
Component: engine
2014-05-21 16:45:41 +08:00
Sven Dowideit
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
Jonathan McCrohan
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
Sven Dowideit
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
unclejack
4c017922d1
default to deleting images via the remote api
...
This makes the remote API version 1.12 and newer default to
automatically deleting intermediate containers when the build has
succeedeed.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: b60d6471721bc914dca179a4372303d41913cc4c
Component: engine
2014-05-19 23:10:54 +03:00
unclejack
978fda27ac
bump remote api to 1.12 & add --force-rm to build
...
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.
This new flag requires that we bump the remote API, so we also bump the
remote API version.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 667e2bd4ea5fbc8698c34565f955cb92cff92890
Component: engine
2014-05-19 23:10:49 +03:00
unclejack
22e627f918
docs: add back build to remote api v1.10 & v1.11
...
This adds back the rm query parameter to the remote api docs for api
v1.10 and v1.11.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: e39299ca1d50df90b085e6a2e3e3f4b6897e5a59
Component: engine
2014-05-19 22:46:19 +03:00
Michael Crosby
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
James Turnbull
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
James Turnbull
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
James Turnbull
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
Brandon Rhodes
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
James Turnbull
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
James Turnbull
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
James Turnbull
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
Adam Singer
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
Alexandr Morozov
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