413eaeb715
blindly make all uses of e\.?g\.? into e.g.,
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: fde10cf87b9f0df6d8aa8683721a6f9d71dda516
Component: engine
2014-07-01 09:55:19 +10:00
b4d4865eb8
Merge pull request #6765 from SvenDowideit/pr_out_use_the_official_image_for_now_there_s_an_opensuse_image_on_its_way
...
use the official image for now - there's an opensuse image on its way
Upstream-commit: 8d1cc686735883f099bcacf78cdc7224b4373bff
Component: engine
2014-06-30 20:00:12 +10:00
08986aa647
use the official image for now - there's an opensuse image on its way
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 24bf8faa99ef7c80aca3ee3a6eac485f74e521ef
Component: engine
2014-06-30 11:46:09 +10:00
a9eca6550a
Changed add to group command to include -a (append) flag, for safety. In response to customer email.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 0acec443745a917fb8e97d50609ff01b03888512
Component: engine
2014-06-27 12:45:55 -07:00
cf59013ad7
Merge pull request #6676 from berendt/opensuse_import_public_gpg_key
...
Import public GPG key after adding the openSUSE repository
Upstream-commit: b074e9b01d2661809fc4c8c9b6dc8afecbabc058
Component: engine
2014-06-26 23:21:10 -07:00
f113260ed3
Merge pull request #6626 from SvenDowideit/pr_out_updated_cloud_sdk_download_link_added_a_command_to_set_the_project
...
Updated Cloud SDK download link, added a command to set the project
Upstream-commit: 8eb34b2a0e73039b126c55c1c8f3328507041b80
Component: engine
2014-06-25 16:36:51 -07:00
acf65eee05
Merge pull request #6590 from robertbachmann/patch
...
Windows needs hardware virtualization
Upstream-commit: 6b6e915b858a9cf772e20ebb42cd67da4875157a
Component: engine
2014-06-25 16:36:30 -07:00
bc88f8248d
Add a step to verify if Docker is working as expected
...
Like in the other installation guides I added a simple test
to verify that importing images and starting containers is
working.
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: f3ea94a79775b30b7338a3fc99923978b260af28
Component: engine
2014-06-25 21:57:54 +02:00
8a88644313
Import public GPG key after adding the openSUSE repository
...
Docker-DCO-1.1-Signed-off-by: Christian Berendt <berendt@b1-systems.de > (github: berendt)
Upstream-commit: 0b2b3221e21c8c6947585481ad476d57653ade28
Component: engine
2014-06-25 21:53:45 +02:00
9fa35c03c4
Merge pull request #6599 from SvenDowideit/6478-update-fedora
...
Update fedora.md
Upstream-commit: 28c22cb7f97ea1d7601fea231944b0dd72899b48
Component: engine
2014-06-23 17:23:00 -07:00
a1cb855e8e
Updated Cloud SDK download link, added a command to set the project
...
no DCO - considered a spelling fix
squashed by
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: c5f1cb11217af9ffcb794f681ef9ab8ae8e2714e
Component: engine
2014-06-24 09:07:10 +10:00
6e5314fd43
Remove $ leaders from examples of editing text in a file
...
not everything that is indented is a commandline example
Closes #6591
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 4d7e28a7d701c3c3ee331f2d6f4fce62fdd20d93
Component: engine
2014-06-23 14:50:11 +10:00
db1600d730
Update fedora.md
...
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: alshopov)
Squashed by
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
replaces #6478
Docker-DCO-1.1-Signed-off-by: Alexander Shopov <ash@kambanaria.org > (github: )
Upstream-commit: 9559f57463f8cd4c1af726514ae744a646fdd462
Component: engine
2014-06-22 19:39:45 -07:00
e953c57f78
Remove mention of SSH passphrase, it was only present in v0.12
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 1e847bff7af8ae722318cc7d448f46be955496c3
Component: engine
2014-06-22 17:36:02 -07:00
b83a4a02c5
Windows needs hardware virtualization
...
VirtualBox needs hardware virtualization for
64-bit guests.
Docker-DCO-1.1-Signed-off-by: Robert Bachmann <rb@robertbachmann.at > (github: robertbachmann)
Upstream-commit: ba7245f07271d5ccba70ef659b3e88424cf36887
Component: engine
2014-06-21 23:14:23 +02:00
fcdeff83df
Merge pull request #6565 from shaunol/patch-1
...
Update windows.md
Upstream-commit: b2eb79b7dad44fcbfac31565bec3763bb7ec796c
Component: engine
2014-06-20 23:27:12 +10:00
1d18ac109a
Merge pull request #6540 from lalyos/docs-installation-mac-windows
...
Fix installation docs to use the new boot2docker command: ip
Upstream-commit: 0d63d68e33d0c74985482aafdd8a3c3c2f757efb
Component: engine
2014-06-20 08:02:56 -05:00
c160f0471c
Update windows.md
...
Update Program Files path description, the default install folder is "Boot2Docker", rather than "Docker"
Upstream-commit: db9bf744ab93f1e688bf986794c852abc40b873e
Component: engine
2014-06-20 19:23:35 +12:00
64dc347e88
full url to GCE image
...
Docker-DCO-1.1-Signed-off-by: Adam Singer <financeCoding@gmail.com > (github: financeCoding)
Upstream-commit: 4efe02b3df67af544d398e435fbe567502bf0dea
Component: engine
2014-06-19 22:01:10 -07:00
fd6ce6d68b
Fix installation docs to use the new boot2docker command: ip
...
Docker-DCO-1.1-Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com > (github: lalyos)
Upstream-commit: 40966fa0966b3acd1893852a5297526374b690f2
Component: engine
2014-06-19 13:00:45 +02:00
67efe6867d
Merge pull request #6363 from proppy/patch-5
...
MAINTAINERS: add proppy for google.md
Upstream-commit: 30313cacce8d1b5c2e373fb2c08b539bfd25007f
Component: engine
2014-06-18 18:03:29 -07:00
74a8a70c93
Merge pull request #6468 from jstoja/6374-docs-apache-image
...
Docs: apache image on installation
Upstream-commit: 2294294e19798a1c2ceb90c5a31a532bb85869c7
Component: engine
2014-06-18 08:19:58 -05:00
da74dc358a
Now using the nginx docker image instead of the apache one. dotcloud/docker/issues/6374
...
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com > (github: jstoja)
Upstream-commit: 207d7807af35a3f1ee98e6401bff83146d2450f8
Component: engine
2014-06-18 00:38:04 +08:00
441ed363ff
Fixed DOCKER_OPTS
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 0b97725340504b57b0abfa112746a16ba6a0d631
Component: engine
2014-06-15 12:26:52 -04:00
1dbb9e510c
Note user name and password in docs on boot2docker
...
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com > (github: nathanleclaire)
Upstream-commit: 073382a9c61fb73b8d1915bf53fa6e8c5bd8fbb8
Component: engine
2014-06-13 15:38:45 -07:00
12e500fd8f
MAINTAINERS: add proppy for google.md
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 37115ffb006fd89e6d3ca7ad8ff8e2ab1b9d38d7
Component: engine
2014-06-11 13:55:47 -07:00
3ad02e9ae6
Improve documentation on Ubuntu for getting the latest release of
...
docker.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 7ab1a90e59b34abda1d2ffa1dd6683302927d9ec
Component: engine
2014-06-09 18:31:46 -07:00
9c48187761
Update windows.md
...
Replace "OS X" by "Windows"
Upstream-commit: 875d0b776d0ec4ba68491f82143e6f099a03944a
Component: engine
2014-06-09 11:23:54 +02:00
56d2049094
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9e2e8188ae8e2c566b3e10c1b23ae3fff8f9d64a
Component: engine
2014-06-08 17:36:49 -07:00
effedf34e2
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)
...
Upstream-commit: 9bc75d008e66eb15b85ac32134e654e07ae9bb7e
Component: engine
2014-06-08 17:35:49 -07:00
9064f1cd9a
Simplify the windows docs and fix formatting
...
The mention of NAT is confusing for those coming from pre-host-only networking b2d
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 744d39a46683909b95ac5a769ae5f839a992d59a
Component: engine
2014-06-09 09:10:41 +10:00
0f870fc34d
Fixed issues in Mac or Windows
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: bb7baf183557fd963f4d1b36ac6a0253a3a0e717
Component: engine
2014-06-08 15:53:20 -07:00
10c982a15a
Removed re-appearing production warnings
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 78426304803bc651fec3ae9b42cf5983d6e03370
Component: engine
2014-06-08 15:35:32 -07:00
18ca2526a5
add an image to show the use of the Docker OSX applet
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: 90251a488d87614770ce7c10265e0b3c8d7f2f9b
Component: engine
2014-06-09 06:51:13 +10:00
6380330c31
Videos for installing b2d
...
Mac and Windows video embeds from YouTube
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: fa7946a510f75a118aaf0d419c0d6c2f6d3b8d73
Component: engine
2014-06-08 13:11:50 -07:00
de4a43cde3
docs/google: fix code blocks
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e2119f3050b225ccaf25990e5d6714dae2de7afe
Component: engine
2014-06-06 13:11:21 -07:00
ddc2df6d84
IANA allocated Docker port: 2375
...
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
For #1440
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
2014-06-04 06:54:19 +10:00
1b1746cd69
Adding User Guide
...
* Added User Guide section outlines.
* Added User Guide to menu.
* Moved HTTPS example to articles.
* Replaced Hello World example with User Guide.
* Moved use cases out of examples.
* Updated Introduction to add User Guide.
* Redirected migrated /use and /articles links.
* Added Docker.io section
* Added Dockerized section
* Added Using Docker section
* Added Docker Images section
* Added Docker Links section
* Added Docker Volumes section
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: a7b2c4804b2d98c2b5622db40d3d70b88529d7fe
Component: engine
2014-06-01 17:34:07 -04:00
13f5758035
sync the initial docs from b2d
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 23dd221e5250398d4120a1f3d1bcb591923f4892
Component: engine
2014-05-30 11:16:38 +10:00
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
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
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
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
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
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
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
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
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
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
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