Commit Graph

88 Commits

Author SHA1 Message Date
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
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
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
1b86d576e7 Closes PR #14503 with this carry
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 831747d59ed45893a0c1947ad369c7e516ec54e8
Component: engine
2015-08-24 13:21:27 -07:00
a4109bfd5c Merge pull request #15774 from charleswhchan/patch-4
Revise Mac Docker instructions
Upstream-commit: 7ead74d903de625eef9dc0ec83ba5bcedd0bc0dc
Component: engine
2015-08-23 10:26:58 +02:00
39b3c96373 Revise Mac Docker instructions
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 9572edc34a65736415050f02df3822edeaa55dbc
Component: engine
2015-08-22 08:00:48 -07:00
7f28a26384 Revise Windows Docker instructions
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 3faba5fbe264425ac6d15bdfdf3c5a72e25643cb
Component: engine
2015-08-22 07:26:26 -07:00
24242b6544 fedora 20 is EOL remove from rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ee1304a35e73049221f8f2c485b5aa2684c1725f
Component: engine
2015-08-21 11:01:18 -07:00
1d21d4d6c1 Fix a windows doc issue
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 3c61ede074000933f2290f8765bc4cface18c0ea
Component: engine
2015-08-20 14:14:48 +02:00
51012044ae Merge pull request #15676 from thaJeztah/fix-anchor-link
docs: fix anchor link on Ubuntu installation page  Merging for @thaJeztah ....da ddadad dadada 🎼 
Upstream-commit: 5fccbd124308a099a0e5ea76addcab5c0a7a952f
Component: engine
2015-08-18 18:55:56 -07:00
84dd1a53ef docs: fix anchor link on Ubuntu installation page
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5dd28c1f9d5933c81c24c9d5fd478239438437f1
Component: engine
2015-08-18 23:41:00 +02:00
15e6133b8f Update dev machine name to default in mac installation docs
Signed-off-by: Michael Grauer <michael.grauer@kitware.com>
Upstream-commit: f26045a53457fd99b0d5f20817f8b7b25db8b6d0
Component: engine
2015-08-15 15:56:41 -04:00
8998990826 docs: fix fedora prerequisites heading
Fixes the prerequisites heading not being
rendered properly, because of a missing space.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c18e1cd053895cd1ef28ec940d4be7f94c97604
Component: engine
2015-08-13 01:29:10 +02:00
2a0dec8002 Updating new vm and with migrate
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e5c160e1d68fa7ed485827a88a577b9fff2077c7
Component: engine
2015-08-10 13:29:08 -07:00
ad4c7580a8 Merge pull request #15400 from vincentbernat/doc/memory-cgroup-overhead
doc: add a notice about memory accounting overhead
Upstream-commit: b173314ccad9462be10b245e116399e5dadffa7c
Component: engine
2015-08-09 16:38:41 -07:00
df69d73527 Merge pull request #15312 from yyekhlef/fedora_22_doc
Fedora 22 manual network configuration and ip forwarding
Upstream-commit: 00843d18d86fe764a7384971392a8a7863bf9a30
Component: engine
2015-08-08 12:59:11 -07:00
3709a03001 Make official install instructions use curl instead of wget
YOU GO CURL

Fixes #14650

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: c76fef1791106ca60b7f913a895a77251b695c0a
Component: engine
2015-08-07 10:16:09 -07:00
a3035b6b7d doc: add a notice about memory accounting overhead
The documentation for Debian and Ubuntu explains how to enable memory
and swap accounting but doesn't explain why it is disabled in the first
place. The problem with those subsystems is that they incurs a
performance hit even when not used at all. Add this explanation.

The provided figure are quite vague. The memory overhead is easily
verifiable. It is for example cited in [RedHat documentation][]. For the
performance hit, maybe the performance is better now, but a few years
ago, it was said to be [between 6 and 15%][].

The goal is that people don't just enable memory accounting if they
don't have a use for it.

[RedHat documentation]: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Resource_Management_Guide/sec-memory.html
[between 6 and 15%]: https://lwn.net/Articles/517562/

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 56b33e9f27fa9dc50cec16392ca01bd4234390f9
Component: engine
2015-08-07 14:31:33 +02:00
6cab088e98 [docs] Add instruction to start docker on Ubuntu
I just tried the installation but docker didn't start automatically. So I had to execute the newly added command in order to get the hello-world verification running.

Signed-off-by: Jenny Gebske <jennifer@gebske.de>
Upstream-commit: a12a781b5ea905271f67bbd533790ad55e82df90
Component: engine
2015-08-06 13:55:32 +02:00
26a62f2497 - Remove references to sudo in basics.md; see sudo instructions top of file
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
67cdf00aed Add fedora 22 install docs warning about systemd-network
With systemd in version 219 IP forwarding should be forced in the interface configuration file.

Signed-off-by: yyekhlef <yyekhlef@gmail.com>
Upstream-commit: 35aebdc803e2ffedf3208f0fd27a7652562fc007
Component: engine
2015-08-05 01:33:13 +02:00
ab644e28c0 Add fedora 22 install docs warning about systemd-network
Following @cles commit #6bd15a68c for Arch

Signed-off-by: yyekhlef <yyekhlef@gmail.com>
Upstream-commit: f224a9f3d609eec8bff9c6be18582eb72cd0e7ef
Component: engine
2015-08-05 01:32:33 +02:00
fcc2624be6 Break long command to avoid cropping
Fixes docker/docker#14558

Signed-off-by: Francesc Campoy <campoy@google.com>
Upstream-commit: 16b5b6e49f3ee1a327216ec9b6fe4b857f3ea7a2
Component: engine
2015-08-03 18:36:32 -07:00
f0e94927fa Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 5f1593c7b8cba267fb044156e152b7afcbcc2cd4
Component: engine
2015-08-03 12:01:25 +02:00