Commit Graph

109 Commits

Author SHA1 Message Date
3c4fcf6b7a Fix typos found across repository
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
b353d85584 docs: fix incorrect package name on Oracle Linux
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d9f4e5c13ccb5c76547937399078784e4e7ed023
Component: engine
2015-12-09 14:19:27 +01:00
e1e5d41283 Change "virtualization" to "containerization"
* Wording around what docker-machine does since the phrase "Docker virtual machine" can cause some confusion.
* Docker Machine isn't a distro in and of itself. It still uses boot2docker as the distro.
* Remove "virtualization" keywords.

Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 0d1c5193b389052f11d77ca576f7dbb49b601135
Component: engine
2015-12-08 15:08:27 -07:00
30eb543363 fix minor markup issues
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f2986cee57e1854f3346ca7609740bdd51d0dcb
Component: engine
2015-12-02 17:21:06 +01:00
529645209e Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater
modified note to provide a link for installation instructions on Ubuntu 15.04 or above

cleaned up typos for ubuntulinux.md

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52
Component: engine
2015-12-02 17:21:05 +01:00
c05f5f5162 Merge pull request #18233 from moxiegirl/carry-17231
Moving prerequisite from #17231
Upstream-commit: aa4fa98ed77f80a9db5e8f7c23ef58a4537a72e1
Component: engine
2015-11-25 16:12:05 +01:00
2d2b79f090 Merge pull request #18209 from martingkelly/18207-deb-multiarch
install.sh: fix for multiarch deb/ubuntu
Upstream-commit: 1892556375ee4425e7c0a8e3e3cfb5f5e7a2c49c
Component: engine
2015-11-25 16:02:36 +01:00
109d171010 Moving prerquisite from #17231
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 20f1a7b496fad1556ccc61f35d58533f885e0ab2
Component: engine
2015-11-25 06:51:23 -08:00
b2c10cb07a 1. Adding note about apparmor install on Ubuntu
2. modified page to remove note for apparmor and added it as a requirement for installing it on ubuntu
3. moved note to under prerequisites section

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 0480da4d8cbd330732f005ea7ec1be93cc00e617
Component: engine
2015-11-24 22:53:14 -08:00
18fcb12c86 install.sh: fix for multiarch deb/ubuntu
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.

Fix this by qualifying the repo line with the currently active
architecture.

This fixes issue #18207.

Signed-off-by: Martin Kelly <martin@surround.io>
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
2015-11-24 16:53:13 -08:00
3f9a89737d Fixed broken links, and updated some to https
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: ad179e0e957a58181d71838eb0c2c7c019b4b2fb
Component: engine
2015-11-24 10:39:02 -05:00
a42c84fec2 Merge pull request #18155 from SvenDowideit/docs-validation-fixes
Fixes found by docs validation tool
Upstream-commit: 0f584219017d0fa9d224f1ca582f281a54e6db2b
Component: engine
2015-11-22 19:39:09 -08:00
5cbd0cc745 Merge pull request #18149 from jeffdm/master
Mark Windows 10 as supported in installation docs
Upstream-commit: f4b2da0145a6f530bc02a893055cc8b7e237fd87
Component: engine
2015-11-23 12:09:00 +10:00
6df421c14f Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
d196c9abf0 use variable instead of hardcoding version in repo
Signed-off-by: Mark McKinstry <mmckinst@umich.edu>
Upstream-commit: 196bd38fdbd05701294eb924755fd551b977d87c
Component: engine
2015-11-22 11:30:18 -05:00
e029cc86e6 Mark Windows 10 as supported in install docs
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
Upstream-commit: 414c8565be6c7edf02880ab1d64f7da4515ce593
Component: engine
2015-11-21 13:42:32 -05:00
4abbb3cdf7 Merge pull request #18109 from phemmer/yum-docs-fix
remove unnecessary echo from yum docs
Upstream-commit: c1f11f81441fffc556ec0a45cb299d16ffe04947
Component: engine
2015-11-20 13:10:55 -05:00
fb0212db59 Merge pull request #17861 from gissehel/apt-source-doc
explicit way to express that docker.list are different choices and not just one big file
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
2015-11-20 10:06:13 +01:00
1b8755d994 remove unnecessary echo from yum docs
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: 3cbccccb37f6f50ebb49e9738af09a0d7d79549a
Component: engine
2015-11-19 20:51:43 -05:00
4457dd940b Merge pull request #18011 from lrkwz/patch-1
Update ubuntulinux.md
Upstream-commit: 2ee56ce1e1b3f8f6ab72b4235ad28387fe81b675
Component: engine
2015-11-17 16:44:33 -08:00
0fb0e27d0c Merge pull request #17419 from nathwill/cent-install-docs
fix yum install docs
Upstream-commit: aeccd45e5b4074cebb1cbe3bb51b6bde4111048a
Component: engine
2015-11-17 20:57:15 +01:00
20dbe8b748 Remove redundent lines
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
Upstream-commit: 741246d69f7708941ee86a706c6e93d20275904f
Component: engine
2015-11-17 18:24:17 +01:00
a3d77b0213 Update ubuntulinux.md
Remove '*' for purge

Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com>
Upstream-commit: fe123edb080a2e60ce4d34fb0cf72d06c80cba79
Component: engine
2015-11-16 13:29:36 +01:00
f625d79ed0 updated instruction to correct file path
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz>
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net>
Upstream-commit: 593586721341c9e0acb00b55d1c3f283ac162697
Component: engine
2015-11-12 16:15:29 +01:00
a03e5da6fb Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
Upstream-commit: 4fca870212ea11010e9dc5ecc802d076dcc1c683
Component: engine
2015-11-10 20:44:18 +00:00
e9df3b10ae explicit way to express that those are different choice and not just one big file to create
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org>
Upstream-commit: e036bf6c0742ef4f3c7caab3ad6960fc27977a1d
Component: engine
2015-11-10 11:41:19 +01:00
2c2adafd8e Merge pull request #17696 from thaJeztah/update-ubuntu-install
Docs: add "Linux kernel extra" to manual install
Upstream-commit: 5e2f31e99220536bc0d845bfbfedde59a007a276
Component: engine
2015-11-06 02:04:05 +01:00
ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
5088f2b31c Docs: add "Linux kernel extra" to manual install
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8e2b20580b82c3d63d4dbbff1d6bee5640a46a8b
Component: engine
2015-11-04 19:49:47 +01:00
16b4f94a28 Fix ubuntu installation instructions page
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: eb0a208f4bad5623e360fa936bfd230cd72414c4
Component: engine
2015-10-30 15:46:34 +01:00
ff3d7b63c1 fix oracle/rhel install docs
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: 258bbdb57e0388309491733fa135b041dd2f2f74
Component: engine
2015-10-27 15:12:15 -07:00
215d5fcb41 fix fedora install docs
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: 6ff8b32bff5a7748cfa41618f7688856c29dd749
Component: engine
2015-10-27 15:11:43 -07:00
e9864fc636 fix docs for cent repo setup
Signed-off-by: Nathan Williams <nath.e.will@gmail.com>
Upstream-commit: c6e1d982666bbf37da746975c5ba7511ea9c98a1
Component: engine
2015-10-27 15:10:45 -07:00
232998cce7 update gpg add key command, without sudo it fails
Signed-off-by: Hugo Marisco <0x6875676f@gmail.com>
Upstream-commit: 7f7953dcc27206acc31bfdef56f7471017640b70
Component: engine
2015-10-27 13:49:52 +00:00
976823bb04 Fix some errant links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 9ed6cec8ff91ff100c268fa21817fdc111e77e43
Component: engine
2015-10-22 20:33:24 +10:00
94c05d87ae Update fedora doc
`service` is deprecated from Fedora v21.
It's important to enable and start the `docker` daemon using `systemctl`.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 6a648659915ad2be4b1e5841594279020821bec1
Component: engine
2015-10-18 23:00:23 +03:00
b34ed2cbab Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
2015-10-11 15:35:04 -07:00
6b6c7cc2b6 Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8fee1c2020186ac100b45e64864b94ae3a169ad5
Component: engine
2015-10-11 07:49:54 -07:00
4e6b402919 Default the tcp port to 2376 if tls is on, and 2375 if not
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
2015-10-09 17:48:03 -07:00
6f6de99953 Do not run yaourt as root/sudo
Signed-off-by: Chris Fordham <chris@fordham-nagy.id.au>
Upstream-commit: e9c64b6d99f23ca2ad6a755952fd9d5bcf63e19c
Component: engine
2015-10-06 17:59:52 +11:00
1aa805ef60 Updating the installations with rpm and yum install
Prefer rpm/yum over script install
Updating with review comments
Adding second round review comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5e061b5945df047c68953aa424fafbc5a2706ab5
Component: engine
2015-10-04 11:29:58 -07:00
238b3791d0 Merge pull request #15327 from flavio/update-suse-docs
Update SUSE docs
Upstream-commit: d2e7ba42b10fda5961470adc4ba4d74011203e60
Component: engine
2015-09-17 16:46:26 -07:00
4f31f389b4 Update SUSE docs
Clarify some parts of the document, add extra resources link.

Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Upstream-commit: 5d6bb52976456d35e3d3a725b8c93992b3e69f31
Component: engine
2015-09-15 14:46:46 +02:00
0982faaaa2 Merge pull request #16241 from jaxgeller/fix-installation-docs
fix typo and cleanup docs for installation.
Upstream-commit: 21cc0ac2c60fd63cfb2041236a84d89c68fdb284
Component: engine
2015-09-14 09:23:33 +10:00
b962eefd8c Fix Ubuntu instalation doc.
Formatting, break `sudo ...` command into 2 lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 6b16c154f56f2b4b62d623ce140ed2bb8994a1f2
Component: engine
2015-09-13 13:29:50 -07:00
a1b4b00b8e fix typo and cleanup docs for installation.
Signed-off-by: Jackson Geller <jacksongeller@gmail.com>
Upstream-commit: 9746021f1a36222111dff1ef95904ba39cc81db5
Component: engine
2015-09-11 13:06:54 -04:00
516a0b9247 Merge pull request #15368 from jengeb/docs-docker-start
[docs] Add instruction to start docker on Ubuntu
Upstream-commit: 1947ab6c1ef7517ac5a66dd11e02809f8f1cdc85
Component: engine
2015-09-08 11:59:13 -07:00
748f1e1ebb [doc] Rephrase Ubuntu installation
Signed-off-by: Jenny Gebske <jennifer@gebske.de>
Upstream-commit: ffc8d4e204b3639a76182e12d27f110986fd79bb
Component: engine
2015-09-03 22:07:33 +02:00
757943440e Adding additional instructions to the Docker Engine installation/index page per discussions with @moxiegirl.
Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: e9eaef6f1e85e949980806e979416c8fb03af2b9
Component: engine
2015-08-31 10:25:41 -05:00
cb83c53d63 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: cefb72080d8d30a2f53ac6c7ae91d58e42210661
Component: engine
2015-08-24 23:02:44 -04:00