Commit Graph

285 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f59da8d68c Update google.md
Fix numbering resets after code sample blocks
Upstream-commit: 3e636446c3a9de24b5b990988e0bd4890277df61
Component: engine
2014-05-12 14:48:03 -04: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
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
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
3db0ad0993 Improve code/comment/output markings & display consistency
This PR aims to increase the consistency across the docs for
code blocks and code/comment/output markings.

Rule followed here is "what's visible on the screen should be reflected"

Issue:

 - Docs had various code blocks showing: comments, commands & outputs.
 - All three of these items were inconsistently marked.

Some examples as to how this PR aims to introduce improvements:

1. Removed `> ` from in front of the "outputs". Eg,
`    > REPOSITORY                 TAG       ID              CREATED` replaced with:
`    REPOSITORY                 TAG       ID              CREATED`.

2. Introduced `$` for commands. Eg,
`    sudo chkconfig docker on` replaced with:
`    $ sudo chkconfig docker on`

3. Comments:
`    > # ` replaced with:
`    # `.

> Please note:
> Due to a vast amount of items reviewed and changed for this PR, there
> might be some individually incorrect replacements OR patterns of incorrect
> replacements. This PR needs to be reviewed and if there is anything missing,
> it should be improved or amended.

Closes:
https://github.com/dotcloud/docker/issues/5286

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: f87a97f7df838742a602f1984f4552b803e3f92d
Component: engine
2014-05-01 17:52:01 +03:00
549ce4c50e remove rst/sphinx documentation
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: adf04681b4bd7293675b77b2397d87a5361b383b
Component: engine
2014-05-01 15:31:58 +10:00
adad81a2c2 initial version of installation on ubuntu 14.04 LTS
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: da8f6ffdeb54a2d99a70deb4ffc58fdff76d5880
Component: engine
2014-04-24 22:59:59 +10:00
b6080f6f5b Looking into some broken links, I noticed that we don't need to use
relative paths, and also fixed some broken images.

There are still more todo - next PR I think :)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ada86fc5b736d8b3209429c584384fd9974a148a
Component: engine
2014-04-24 22:20:04 +10:00
772ac62a9b Docs auto-conversion fixes and MD marking and structure improvements.
- Remove redundant chars and all errors caused by RST->MD conversion.
   e.g. [/#, /\, \<, />, etc.]
 - Fix broken inter-document links
 - Fix outbound links no-longer active or changed
 - Fix lists
 - Fix code blocks
 - Correct apostrophes
 - Replace redundant inline note marks for code with code marks
 - Fix broken image links
 - Remove non-functional title links
 - Correct broken cross-docs links
 - Improve readability

Note: This PR does not try to fix/amend:

 - Grammatical errors
 - Lexical errors
 - Linguistic-logic errors etc.

It just aims to fix main structural or conversion errors to serve as
a base for further amendments that will cover others including but
not limited to those mentioned above.

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

Update:

 - Fix backtick issues

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: c932667cd26f00bb64ddf0c1a7c7de3ac95aa4be
Component: engine
2014-04-24 22:19:32 +10:00
e783599ff4 on a fresh OSX, /usr/local/bin doesn't exist
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: b26821e5c01bc0176357c41cdb7ff9a7cf3fb9df
Component: engine
2014-04-20 22:56:22 +10:00
8d460ab22d Merge pull request #5213 from tianon/missing-ps-requirement
Add missing "ps" requirement to PACKAGERS.md
Upstream-commit: 231f53fd9b52229ba3aa1d27bdebf775ab7397b5
Component: engine
2014-04-19 21:24:30 -06:00
c565574306 Mark notes and warnings, fix broken link renderings within.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 7935850005b775e0cd1a99f9bab1b8cd53784c3a
Component: engine
2014-04-18 23:31:38 +03:00
1bbbedd397 Fixed #5283 - literal leftover from cutover
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 2f3cb370dfaca1f1c41bbd7af5f064f70ad8267b
Component: engine
2014-04-17 18:58:02 -04:00
4e25aa80e6 Fix for broken in-document links which got scrambled during conversion.
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 1ff66d27b5b35b9782d6d6cdd5fc5ec95bdda07d
Component: engine
2014-04-17 18:09:08 +03:00
26f35ab8b4 Add missing "ps" requirement to PACKAGERS.md
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 2e78ab91ec0c99c52e4b61fe186f0ad8048de9e8
Component: engine
2014-04-15 21:55:48 -06:00
c4684e29f0 now, with shiney markdown
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: ac999a9cb2b0976e021aeb8825bb051df6bd0976
Component: engine
2014-04-16 11:04:14 +10:00
5c2b3f3f64 move the documentation to markdown
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: a777ebcee6326bed2f7e99eedf6edbb922175e2d
Component: engine
2014-04-16 11:04:01 +10:00
2cd55701e9 Docs: improve installation/ubuntulinux memory and swap accounting section
Docker-DCO-1.1-Signed-off-by: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com> (github: jbbarth)
Upstream-commit: 0a0e49d406d10ce7c79952c78162768dd05ee875
Component: engine
2014-04-12 10:57:19 +00:00
c176d6dfb2 Update mac.rst to add homebrew instructions.
Explain how to install boot2docker and docker by using homebrew.

Docker-DCO-1.1-Signed-off-by: Jonathan Pares <jonathanpa@users.noreply.github.com> (github: jonathanpa)
Upstream-commit: 057d347eafaea9a0044b70e516ace504904a5ba4
Component: engine
2014-04-10 09:48:36 +02:00
f13ce48af5 Merge pull request #4997 from jpetazzo/apt-should-always-use-https
Use https://get.docker.io/ubuntu consistently
Upstream-commit: 02c5a87b402cb1b575d84a86c118a1efcb6abd7f
Component: engine
2014-04-08 11:24:07 +10:00
7ceff89f33 Merge pull request #4715 from sebsto/patch-1
Include instruction for AMI 2014.03
Upstream-commit: 6e0d8ce8c350c32dcde79fdd34e414e8d28f53d7
Component: engine
2014-04-08 11:02:54 +10:00
4684a5ac26 Merge pull request #4764 from SvenDowideit/use-docker-tgz
Use docker tgz file to download on OSX
Upstream-commit: 7fddec4a65656844fd8c6aad85198273185450a2
Component: engine
2014-04-07 11:54:27 -07:00
4fcce7c1ce Use https://get.docker.io/ubuntu consistently
The install script (on https://get.docker.io/) installs an APT sources.list
entry referencing an HTTPS repository, and takes care of installing the
apt-transport-https package. However, the Debian/Ubuntu specific installation
script (on https://get.docker.io/ubuntu) used an HTTPS repository but without
installing that package, causing the installation to fail on some platforms.

This will use HTTPS everywhere, and updates the documentation accordingly.

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)

Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
Upstream-commit: dc7fefc16bfcc4e6d0ccb30233e50b0ab3d172f1
Component: engine
2014-04-07 11:32:12 -07:00