Commit Graph

183 Commits

Author SHA1 Message Date
15482db5bf docs: add missing 'on' in Oracle installation guide
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com>
Upstream-commit: 838fe65e5332dd79f5cf8551d70906d9801f79fb
Component: engine
2016-09-22 14:34:25 +02:00
6851b71de6 Merge pull request #26706 from thaJeztah/update-systemd-instructions
Cleanup / sync RHEL, CentOS, Fedora installation docs
Upstream-commit: 920cb5834b66a27b68b83c5b4e81f027103ced68
Component: engine
2016-09-19 22:10:30 +02:00
91ef538450 Cleanup / sync RHEL, CentOS, Fedora installation docs
These installation procedures are very similar, so
synchronized these docs and removed some differences.

Also;

- updated markdown, added language-hints where possible
- replaced "service docker start" with "systemctl start"
- replaced "chkconfig docker on" with "systemctl enable"
- added "systemctl enable" to the list of steps for
  installation, because most people want to have docker
  started automatically (and overlooked this step).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b2bb4e11aa656947e45b752aa4f5d5b5cdc693cd
Component: engine
2016-09-19 21:30:57 +02:00
388c6920f1 Fix typos in installation doc for Mac
Signed-off-by: Alex Olshansky <i@creagenics.com>
Upstream-commit: f7af5cc780cb49b6115c726687dec5ef361ca5fb
Component: engine
2016-09-19 16:04:46 +02:00
744afc226e Merge pull request #26691 from YuPengZTE/devSUSE
Add prompt of $
Upstream-commit: abd02a9ba0aea79e0b77b8dfb65c8d77614f3ecf
Component: engine
2016-09-19 10:45:23 +02:00
1ea61b91e9 Add prompt of $
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: 638546d1206dd229c5e00df0725de6966725b2e0
Component: engine
2016-09-19 10:46:25 +08:00
8c00a65ba2 Merge pull request #26678 from YuPengZTE/devSUDO
Add bash symbol for sudo
Upstream-commit: 1444401b164006cb13c23208dc8aeebcf980f629
Component: engine
2016-09-18 13:36:13 +02:00
215a6916ca The hit is missed
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: ced272984157e277523a942505435aa392913ac4
Component: engine
2016-09-18 09:38:20 +08:00
32dd641688 Merge pull request #26266 from YuPengZTE/dev
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
2016-09-17 03:37:00 +02:00
454d1d388e Remove Frugalware installation docs
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12
Component: engine
2016-09-14 18:10:25 +02:00
297af6f7a7 The etc and dot is seprated
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: bd914ff5a31b1b39bdd9c0fbacf76c65c2b1e842
Component: engine
2016-09-07 09:02:16 +08:00
f07d519e90 remove mess words in installation doc
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: f8d5b880722bcc87113a08cbb2069b6311b89f39
Component: engine
2016-08-17 15:43:52 +08:00
0fd4a2c993 James' site has been dead for a while - removing links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a9b08f3102e946df44337deb65c99b41570754d1
Component: engine
2016-08-12 21:16:57 +00:00
7c0ad19006 Add install of virtual kernel extras for AUFS
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: e715ca506f41b22cde21187328fcb416cec5e6a2
Component: engine
2016-08-11 07:54:20 -04:00
6867071d80 Make it clear which parmeter is the user
Using the environment variable here also has the advantage that it can be copied and pasted directly in a terminal and it will work.

Signed-off-by: David Lechner <david@lechnology.com>
Upstream-commit: e10ba68bfdbedb47b7e92c3aee5e66e5884d16c3
Component: engine
2016-07-29 19:08:20 -05:00
02e14246d7 Remove docker.socket from rpm based systems
Fixes #23981

The selinux issue we are seeing in the report is related to the socket
file for docker and nothing else. By removing the socket docker starts
up correctly.

However, there is another motivation for removing socket activation from
docker's systemd files and that is because when you have daemons running
with --restart always whenever you have a host reboot those daemons
will not be started again because the docker daemon is not started by
systemd until a request comes into the docker API.

Leave it for deb based systems because everything is working correctly
for both socket activation and starting normally at boot.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 04104c3a1e6cad30cb41b762e8832215466c0e95
Component: engine
2016-07-19 09:31:43 -07:00
0b31b4284a Merge pull request #24659 from justyntemme/master
Fix for issue #23884 (Documentation clarification)
Upstream-commit: 8ef820b53925a7600ee5485d8acf14cc3e35fc11
Component: engine
2016-07-18 21:58:55 +02:00
a9b08686d4 suggested improvements for Debian install doc issue #23884
Signed-off-by: Justyn Temme <justyntemme@gmail.com>
Upstream-commit: b74b46b26a8a8fcacc1fdea080c0bebe70194e9f
Component: engine
2016-07-18 14:38:58 -05:00
a5d67e2744 docs: update Oracle support link
The none-https url results in a redirect
to https://support.oracle.com/epmos/faces/MosIndex.jspx?......
which our link-checker didn't like.

The https link looks to be a direct link,
and not resulting in a redirect, so updating the URL.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c15144c4ec25df4234129fbe88b89cd4f709f784
Component: engine
2016-07-16 14:34:07 +02:00
25e8fa8dc7 fixed cut-and-paste error on description of Docker Toolbox
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 6f9e310831326b8031a3526282ffd82cee94294f
Component: engine
2016-07-15 13:54:34 -07:00
a7897f1409 State that docker supports fedora 24
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6780bdcbad3ab3b3de1568e51db676bb0f059cd8
Component: engine
2016-07-14 16:24:21 -07:00
04ff70ab75 Enable docker socket and service on fedora
Make sure that the users enable both the socket and service for docker
as part of the default install instructions.  If both are not enabled
docker will not start at boot and restart containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7a93a87c1a254abbf8e68093d4be241097694bb1
Component: engine
2016-07-14 16:23:05 -07:00
da13a0bd34 Make archive links absolute
The archive is only available on docs.docker.com, and not
when doing a "make docs", so relative links will not resolve.

Making these links absolute, so that they always
point to the live "docs.docker.com" domain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4b090ae5f259dcedb946463a8512b2416a971fcb
Component: engine
2016-07-08 12:06:36 -07:00
5bd4fa63c5 Update binary install docs with new contents of tgz
This is now up to date with contents of 1.12 tgz

Also change usage to `dockerd` not `docker daemon`

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 7102e09f29822e4bb0e375738c5194ded8b716ca
Component: engine
2016-07-08 13:33:41 +01:00
a75adf3964 Merge pull request #23797 from liubin/fix-typo
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
d37f26ec66 Now that the Docker4 links are online, we can use them
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 587d2f9d8132c4ba8cfa74e5f0f2ec3328fdf9b9
Component: engine
2016-06-21 12:55:41 +00:00
923b4bd8ef fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
14409cb989 bad url
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: c2495dbe6d4961cb2b2eb975c4d4758ece0c8c45
Component: engine
2016-06-18 13:00:38 +00:00
9b853ff739 install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
fixing links to d4mac and d4win

updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.

updates per Sven's comments in the PR

removed duplicate line in tutorials menu.md

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -07:00
c8d6ba6b3c Fixes #23376 Broken URL for Centos yum repo for docker changed to now have a hardcoded centos version 7
Signed-off-by: Shoubhik Bose <sbose78@gmail.com>
Upstream-commit: d3fad80cc7823eddb823dd53424a28ee81043f18
Component: engine
2016-06-14 10:06:00 +00:00
5578aba972 Merge pull request #23193 from allencloud/fix-typos
use grep to find all a/an typos
Upstream-commit: 98c245c9e63793cf8ca03c5500e0820447c1861c
Component: engine
2016-06-02 18:45:08 -07:00
35c5774373 fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c1be45fa38e82054dcad606d71446a662524f2d5
Component: engine
2016-06-02 17:17:22 +08:00
2b5acd6315 Fix the docker daemon restart command for ubuntu.
Signed-off-by: Senthil Kumaran <senthil@uthcode.com>
Upstream-commit: 53a1de2b1651f0cd5fb3a1f5a3c26f4d5f5dd9b2
Component: engine
2016-06-01 22:32:35 -07:00
06a16bdf54 Merge pull request #22999 from deed02392/master
Update debian.md
Upstream-commit: 215324251aed0df84d0a5a876ccd5a7e537a41a1
Component: engine
2016-05-26 15:37:55 +02:00
0c3fa0e2e7 Update debian.md
Updated documents markdown file on Debian installation.
Added details on the fact that backports are necessary on Wheezy as discussed in issue #16878

Signed-off-by: George Hafiz <george@hafiz.uk>
Upstream-commit: 6c5f724560d3e1c47c927fa39056cd32de9f0890
Component: engine
2016-05-26 13:47:19 +01:00
ce0de1f301 Fix URLs for official Oracle installation guide.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 7711c842be52cd753c13a50594da301f2158ddae
Component: engine
2016-05-26 07:40:01 +10:00
77d9ae179d fix duplicate command in uninstall instructions
Signed-off-by: Zunayed Ali <zunayed@gmail.com>
Upstream-commit: 160a6430a91de00c065fe5900e7fd96a46f87a45
Component: engine
2016-05-18 20:12:29 +00:00
79ba4ce6e9 Update the docker daemon to dockerd for document
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 24ec73f754da16e37726a3f1c6a59de508e255fc
Component: engine
2016-04-29 09:06:02 +08:00
35dbb56580 docs: update installation from binaries for 1.11
Binaries are now distributed as a '.tgz' or '.zip'
archive, and contain multiple binaries for Linux.

This updates the instructions for 1.11.

Also mention that the Windows 64-bit binary
actually can be used as a daemon. Given that
this is still in beta, no instructions were
added for *running* a daemon on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f5336c737086a4c1807bb2b6ab57116b5ed9d769
Component: engine
2016-04-13 15:26:03 +02:00
8fcbd21a4a docs: add Ubuntu 16.04 "xenial"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 62e7fde80fde2efda14d2b60061106ea48715c50
Component: engine
2016-03-25 10:48:51 -07:00
df52f37984 Fix several typos in the documentation.
This pull request fixes several typos in the documentation.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 3c6aa163a3fd04c344a2072ab379f0778734b269
Component: engine
2016-03-17 18:29:35 +00:00
7cabfb9016 Creates docker group for non-root access
Signed-off-by: trishnaguha <trishnaguha17@gmail.com>
Upstream-commit: cdd8d3999ffd9f7eeb764f52e21577e0900d7b5c
Component: engine
2016-03-08 21:03:14 +05:30
128898860a add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu arch note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

fix ubuntu installation guide url

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu arch note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu arch note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

fix ubuntu installation guide url

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu arch note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu arch note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

add ubuntu installation note

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>

fix ubuntu installation guide url

Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
Upstream-commit: b2f1f7ee00070aa5ae0265296baee2a268aa3cbc
Component: engine
2016-03-06 14:19:58 +08:00
3276f20bd0 Update links to Docker Hub
Updates links to Docker Hub with their new
URLs to prevent redirects.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69004ff67eed6525d56a92fdc69466c41606151a
Component: engine
2016-03-04 15:48:52 +01:00
9c67867382 Changed Docker references to Docker Engine in docs
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com>
Upstream-commit: 0b882cc0140bc03dfe79462c5cdf77b972c94067
Component: engine
2016-03-01 00:57:23 +00:00
7adb67365b remove leftover Ubuntu 15.04 from install docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1ca064cb62a88366bc13af67a112aff8992b6b68
Component: engine
2016-02-26 13:00:27 +01:00
e61c546929 fixing the path of the key pair
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
2016-02-23 11:32:28 -07:00
e1a8ad7624 Fix documentation typos
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
3e249a8f81 added better what's next topics to point to new machine docs related to Issue #18282
updated cloud install example per Olivier's comments, added better command examples

updates per @thaJeztah comments

fixed links per @theJeztah comments, renamed cloud.md to overview.md for better URL name

updates per @moxiegirl comments, added alias for renamed file, modified links, changed a title

fixed link errors

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 4e9e95fe8d9ba177ec77727b6fca558a0ba8f01f
Component: engine
2016-02-10 14:19:05 -08:00
5934d3cb06 Fix typo in Docker Toolbox upgrade section
Signed-off-by: Chad Swenson <chadswen@gmail.com>
Upstream-commit: 1435c9ea21d6c76a923c2501abb840e899b5ed1e
Component: engine
2016-02-09 11:36:45 -06:00