Browse code

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>

Mary Anthony authored on 2015/09/29 06:01:52
Showing 6 changed files
... ...
@@ -5,18 +5,15 @@ description = "Instructions for installing Docker on CentOS"
5 5
 keywords = ["Docker, Docker documentation, requirements, linux, centos, epel, docker.io,  docker-io"]
6 6
 [menu.main]
7 7
 parent = "smn_linux"
8
+weight=-4
8 9
 +++
9 10
 <![end-metadata]-->
10 11
 
11 12
 # CentOS
12 13
 
13
-Docker is supported on the following versions of CentOS:
14
-
15
-* CentOS 7.X 
16
-
17
-Installation on other binary compatible EL7 distributions such as Scientific
18
-Linux might succeed, but Docker does not test or support Docker on these
19
-distributions.
14
+Docker runs on CentOS 7.X. An installation on other binary compatible EL7
15
+distributions such as Scientific Linux might succeed, but Docker does not test
16
+or support Docker on these distributions.
20 17
 
21 18
 This page instructs you to install using Docker-managed release packages and
22 19
 installation mechanisms. Using these packages ensures you get the latest release
... ...
@@ -31,7 +28,7 @@ your kernel must be 3.10 at minimum, which CentOS 7 runs.
31 31
 To check your current kernel version, open a terminal and use `uname -r` to
32 32
 display your kernel version:
33 33
 
34
-    $ uname -r 
34
+    $ uname -r
35 35
     3.10.0-229.el7.x86_64
36 36
 
37 37
 Finally, is it recommended that you fully update your system. Please keep in
... ...
@@ -41,66 +38,20 @@ packages.
41 41
 
42 42
 ## Install
43 43
 
44
-There are two ways to install Docker Engine.  You can use `curl` with the  `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
45
-
46
-### Install with the script
44
+There are two ways to install Docker Engine.  You can install using the `yum`
45
+package manager. Or you can use `curl` with the  `get.docker.com` site. This
46
+second method runs an installation script which also installs via the `yum`
47
+package manager.
47 48
 
48
-
49
-1. Log into your machine as a user with `sudo` or `root` privileges.
50
-
51
-2. Make sure your existing yum packages are up-to-date.
52
-
53
-		$ sudo yum update
54
-		
55
-3. Run the Docker installation script.
56
-		
57
-		$ curl -sSL https://get.docker.com/ | sh
58
-		
59
-		This script adds the `docker.repo` repository and installs Docker.
60
-
61
-4. Start the Docker daemon.
62
-
63
-		$ sudo service docker start
64
-
65
-5. Verify `docker` is installed correctly by running a test image in a container.
66
-
67
-		$ sudo docker run hello-world
68
-		Unable to find image 'hello-world:latest' locally
69
-		latest: Pulling from hello-world
70
-		a8219747be10: Pull complete 
71
-		91c95931e552: Already exists 
72
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
73
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
74
-		Status: Downloaded newer image for hello-world:latest
75
-		Hello from Docker.
76
-		This message shows that your installation appears to be working correctly.
77
-
78
-		To generate this message, Docker took the following steps:
79
-		 1. The Docker client contacted the Docker daemon.
80
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
81
-				(Assuming it was not already locally available.)
82
-		 3. The Docker daemon created a new container from that image which runs the
83
-				executable that produces the output you are currently reading.
84
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
85
-				to your terminal.
86
-
87
-		To try something more ambitious, you can run an Ubuntu container with:
88
-		 $ docker run -it ubuntu bash
89
-
90
-		For more examples and ideas, visit:
91
-		 http://docs.docker.com/userguide/
92
-
93
-### Install without the script
49
+### Install with yum
94 50
 
95 51
 1. Log into your machine as a user with `sudo` or `root` privileges.
96 52
 
97 53
 2. Make sure your existing yum packages are up-to-date.
98 54
 
99 55
         $ sudo yum update
100
-    
101
-3. Add the yum repo yourself.
102 56
 
103
-    For CentOS 7 run:
57
+3. Add the yum repo.
104 58
 
105 59
         $ cat >/etc/yum.repos.d/docker.repo <<-EOF
106 60
         [dockerrepo]
... ...
@@ -114,7 +65,7 @@ There are two ways to install Docker Engine.  You can use `curl` with the  `get.
114 114
 4. Install the Docker package.
115 115
 
116 116
         $ sudo yum install docker-engine
117
-        
117
+
118 118
 5. Start the Docker daemon.
119 119
 
120 120
         $ sudo service docker start
... ...
@@ -122,7 +73,55 @@ There are two ways to install Docker Engine.  You can use `curl` with the  `get.
122 122
 6. Verify `docker` is installed correctly by running a test image in a container.
123 123
 
124 124
         $ sudo docker run hello-world
125
- 
125
+        Unable to find image 'hello-world:latest' locally
126
+    		latest: Pulling from hello-world
127
+    		a8219747be10: Pull complete
128
+    		91c95931e552: Already exists
129
+    		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
130
+    		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
131
+    		Status: Downloaded newer image for hello-world:latest
132
+    		Hello from Docker.
133
+    		This message shows that your installation appears to be working correctly.
134
+
135
+    		To generate this message, Docker took the following steps:
136
+    		 1. The Docker client contacted the Docker daemon.
137
+    		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
138
+    				(Assuming it was not already locally available.)
139
+    		 3. The Docker daemon created a new container from that image which runs the
140
+    				executable that produces the output you are currently reading.
141
+    		 4. The Docker daemon streamed that output to the Docker client, which sent it
142
+    				to your terminal.
143
+
144
+    		To try something more ambitious, you can run an Ubuntu container with:
145
+    		 $ docker run -it ubuntu bash
146
+
147
+    		For more examples and ideas, visit:
148
+    		 http://docs.docker.com/userguide/
149
+
150
+### Install with the script
151
+
152
+
153
+1. Log into your machine as a user with `sudo` or `root` privileges.
154
+
155
+2. Make sure your existing yum packages are up-to-date.
156
+
157
+		$ sudo yum update
158
+
159
+3. Run the Docker installation script.
160
+
161
+		$ curl -sSL https://get.docker.com/ | sh
162
+
163
+	This script adds the `docker.repo` repository and installs Docker.
164
+
165
+4. Start the Docker daemon.
166
+
167
+		$ sudo service docker start
168
+
169
+5. Verify `docker` is installed correctly by running a test image in a container.
170
+
171
+		$ sudo docker run hello-world
172
+
173
+
126 174
 ## Create a docker group		
127 175
 
128 176
 The `docker` daemon binds to a Unix socket instead of a TCP port. By default
... ...
@@ -152,7 +151,7 @@ To create the `docker` group and add your user:
152 152
 4. Verify your work by running `docker` without `sudo`.
153 153
 
154 154
 		$ docker run hello-world
155
- 
155
+
156 156
 ## Start the docker daemon at boot
157 157
 
158 158
 To ensure Docker starts when you boot your system, do the following:
... ...
@@ -172,15 +171,14 @@ You can uninstall the Docker software with `yum`.
172 172
 
173 173
 		$ yum list installed | grep docker
174 174
 		yum list installed | grep docker
175
-		docker-engine.x86_64                1.7.1-1.el7
176
-																																								 @/docker-engine-1.7.1-1.el7.x86_64.rpm
175
+		docker-engine.x86_64   1.7.1-1.el7 @/docker-engine-1.7.1-1.el7.x86_64.rpm
177 176
 
178 177
 2. Remove the package.
179 178
 
180
-		$ sudo yum -y remove docker-engine.x86_64 
179
+		$ sudo yum -y remove docker-engine.x86_64
181 180
 
182 181
 	This command does not remove images, containers, volumes, or user-created
183
-	configuration files on your host. 
182
+	configuration files on your host.
184 183
 
185 184
 3. To delete all images, containers, and volumes, run the following command:
186 185
 
... ...
@@ -5,6 +5,7 @@ description = "Instructions for installing Docker on Debian."
5 5
 keywords = ["Docker, Docker documentation, installation,  debian"]
6 6
 [menu.main]
7 7
 parent = "smn_linux"
8
+weight=-2
8 9
 +++
9 10
 <![end-metadata]-->
10 11
 
... ...
@@ -12,113 +13,98 @@ parent = "smn_linux"
12 12
 
13 13
 Docker is supported on the following versions of Debian:
14 14
 
15
+ - [*Debian testing stretch (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
15 16
  - [*Debian 8.0 Jessie (64-bit)*](#debian-jessie-80-64-bit)
16 17
  - [*Debian 7.7 Wheezy (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
17 18
 
18
-## Debian Jessie 8.0 (64-bit)
19
+ >**Note**: If you previously installed Docker using `apt`, make sure you update
20
+ your `apt` sources to the new `apt` repository.
19 21
 
20
-Debian 8 comes with a 3.16.0 Linux kernel, the `docker.io` package can be found in the `jessie-backports` repository. Reasoning behind this can be found <a href="https://lists.debian.org/debian-release/2015/03/msg00685.html" target="_blank">here</a>. Instructions how to enable the backports repository can be found <a href="http://backports.debian.org/Instructions/" target="_blank">here</a>.
22
+## Prerequisites
21 23
 
22
-> **Note**:
23
-> Debian contains a much older KDE3/GNOME2 package called ``docker``, so the
24
-> package and the executable are called ``docker.io``.
24
+ Docker requires a 64-bit installation regardless of your Debian version.
25
+ Additionally, your kernel must be 3.10 at minimum. The latest 3.10 minor
26
+ version or a newer maintained version are also acceptable.
25 27
 
26
-### Installation
28
+ Kernels older than 3.10 lack some of the features required to run Docker
29
+ containers. These older versions are known to have bugs which cause data loss
30
+ and frequently panic under certain conditions.
27 31
 
28
-Make sure you enabled the `jessie-backports` repository, as stated above.
32
+ To check your current kernel version, open a terminal and use `uname -r` to
33
+ display your kernel version:
29 34
 
30
-To install the latest Debian package (may not be the latest Docker release):
35
+     $ uname -r
31 36
 
32
-    $ sudo apt-get update
33
-    $ sudo apt-get install docker.io
37
+### Update your apt repository
34 38
 
35
-To verify that everything has worked as expected:
39
+Docker's `apt` repository contains Docker 1.7.1 and higher. To set `apt` to use
40
+from the new repository:
36 41
 
37
-    $ sudo docker run --rm hello-world
42
+ 1. If you haven't already done so, log into your machine as a user with `sudo` or `root` privileges.
38 43
 
39
-This command downloads and runs the `hello-world` image in a container. When the
40
-container runs, it prints an informational message. Then, it exits.
44
+ 2. Open a terminal window.
41 45
 
42
-If you need to add an HTTP Proxy, set a different directory or partition for the
43
-Docker runtime files, or make other customizations, read our Systemd article to
44
-learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
46
+ 3. Purge any older repositories.
45 47
 
46
-> **Note**:
47
-> If you want to enable memory and swap accounting see
48
-> [this](/installation/ubuntulinux/#adjust-memory-and-swap-accounting).
48
+         $ apt-get purge lxc-docker*
49
+         $ apt-get purge docker.io*
49 50
 
50
-### Uninstallation
51
+ 4. Add the new `gpg` key.
51 52
 
52
-To uninstall the Docker package:
53
-
54
-    $ sudo apt-get purge docker.io
55
-
56
-To uninstall the Docker package and dependencies that are no longer needed:
57
-
58
-    $ sudo apt-get autoremove --purge docker.io
53
+         $ apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
59 54
 
60
-The above commands will not remove images, containers, volumes, or user created
61
-configuration files on your host. If you wish to delete all images, containers,
62
-and volumes run the following command:
55
+ 5. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor.
63 56
 
64
-    $ rm -rf /var/lib/docker
57
+     If the file doesn't exist, create it.
65 58
 
66
-You must delete the user created configuration files manually.
59
+ 6. Remove any existing entries.
67 60
 
68
-## Debian Wheezy/Stable 7.x (64-bit)
61
+ 7. Add an entry for your Debian operating system.
69 62
 
70
-Docker requires Kernel 3.8+, while Wheezy ships with Kernel 3.2 (for more details
71
-on why 3.8 is required, see discussion on
72
-[bug #407](https://github.com/docker/docker/issues/407)).
63
+     The possible entries are:
73 64
 
74
-Fortunately, wheezy-backports currently has [Kernel 3.16
75
-](https://packages.debian.org/search?suite=wheezy-backports&section=all&arch=any&searchon=names&keywords=linux-image-amd64),
76
-which is officially supported by Docker.
65
+         # Debian Wheezy
66
+        deb https://apt.dockerproject.org/repo debian-wheezy main
67
+        # Debian Jessie
68
+        deb https://apt.dockerproject.org/repo debian-jessie main
69
+        # Debian Stretch/Sid
70
+        deb https://apt.dockerproject.org/repo debian-stretch main
77 71
 
78
-### Installation
72
+ 8. Save and close the file.
79 73
 
80
-1. Install Kernel from wheezy-backports
74
+ 9. Update the `apt` package index.
81 75
 
82
-    Add the following line to your `/etc/apt/sources.list`
76
+         $ apt-get update
83 77
 
84
-    `deb http://http.debian.net/debian wheezy-backports main`
78
+ 10. Verify that `apt` is pulling from the right repository.
85 79
 
86
-    then install the `linux-image-amd64` package (note the use of
87
-    `-t wheezy-backports`)
80
+         $ apt-cache policy docker-engine
88 81
 
89
-        $ sudo apt-get update
90
-        $ sudo apt-get install -t wheezy-backports linux-image-amd64
82
+     From now on when you run `apt-get upgrade`, `apt` pulls from the new apt repository.  
91 83
 
92
-2. Restart your system. This is necessary for Debian to use your new kernel.
84
+## Install Docker
93 85
 
94
-3. Install Docker using the get.docker.com script:
86
+Before installing Docker, make sure you have set your `apt` repository correctly as described in the prerequisites.
95 87
 
96
-    `curl -sSL https://get.docker.com/ | sh`
88
+1. Update the `apt` package index.
97 89
 
98
->**Note**: If your company is behind a filtering proxy, you may find that the
99
->`apt-key`
100
->command fails for the Docker repo during installation. To work around this,
101
->add the key directly using the following:
102
->
103
->       $ curl -sSL https://get.docker.com/gpg | sudo apt-key add -
90
+        $ sudo apt-get update
104 91
 
105
-### Uninstallation
92
+2. Install Docker.
106 93
 
107
-To uninstall the Docker package:
94
+        $ sudo apt-get install docker-engine
108 95
 
109
-    $ sudo apt-get purge docker-engine
96
+5. Start the `docker` daemon.
110 97
 
111
-To uninstall the Docker package and dependencies that are no longer needed:
98
+        $ sudo service docker start
112 99
 
113
-    $ sudo apt-get autoremove --purge docker-engine
100
+6. Verify `docker` is installed correctly.
114 101
 
115
-The above commands will not remove images, containers, volumes, or user created
116
-configuration files on your host. If you wish to delete all images, containers,
117
-and volumes run the following command:
102
+        $ sudo docker run hello-world
118 103
 
119
-    $ rm -rf /var/lib/docker
104
+    This command downloads a test image and runs it in a container. When the
105
+    container runs, it prints an informational message. Then, it exits.
120 106
 
121
-You must delete the user created configuration files manually.
122 107
 
123 108
 ## Giving non-root access
124 109
 
... ...
@@ -154,6 +140,29 @@ use the `-G` flag to specify an alternative group.
154 154
     # Restart the Docker daemon.
155 155
     $ sudo service docker restart
156 156
 
157
+## Upgrade Docker
158
+
159
+To install the latest version of Docker with `apt-get`:
160
+
161
+    $ apt-get upgrade docker-engine
162
+
163
+## Uninstall
164
+
165
+To uninstall the Docker package:
166
+
167
+    $ sudo apt-get purge docker-engine
168
+
169
+To uninstall the Docker package and dependencies that are no longer needed:
170
+
171
+    $ sudo apt-get autoremove --purge docker-engine
172
+
173
+The above commands will not remove images, containers, volumes, or user created
174
+configuration files on your host. If you wish to delete all images, containers,
175
+and volumes run the following command:
176
+
177
+    $ rm -rf /var/lib/docker
178
+
179
+You must delete the user created configuration files manually.
157 180
 
158 181
 ## What next?
159 182
 
... ...
@@ -5,108 +5,47 @@ description = "Instructions for installing Docker on Fedora."
5 5
 keywords = ["Docker, Docker documentation, Fedora, requirements,  linux"]
6 6
 [menu.main]
7 7
 parent = "smn_linux"
8
+weight=-3
8 9
 +++
9 10
 <![end-metadata]-->
10 11
 
11 12
 # Fedora
12 13
 
13
-Docker is supported on the following versions of Fedora:
14
-
15
-- Fedora 21
16
-- Fedora 22 
17
-
18
-This page instructs you to install using Docker-managed release packages and
19
-installation mechanisms. Using these packages ensures you get the latest release
20
-of Docker. If you wish to install using Fedora-managed packages, consult your
21
-Fedora release documentation for information on Fedora's Docker support.
14
+Docker is supported Fedora version 21 and 22. This page instructs you to install
15
+using Docker-managed release packages and installation mechanisms. Using these
16
+packages ensures you get the latest release of Docker. If you wish to install
17
+using Fedora-managed packages, consult your Fedora release documentation for
18
+information on Fedora's Docker support.
22 19
 
23 20
 ## Prerequisites
24 21
 
25 22
 Docker requires a 64-bit installation regardless of your Fedora version. Also, your kernel must be 3.10 at minimum. To check your current kernel
26 23
 version, open a terminal and use `uname -r` to display your kernel version:
27 24
 
28
-    $ uname -r 
29
-    3.19.5-100.fc20.x86_64
25
+    $ uname -r
26
+    3.19.5-100.fc21.x86_64
30 27
 
31 28
 If your kernel is at a older version, you must update it.
32 29
 
33 30
 Finally, is it recommended that you fully update your system. Please keep in
34 31
 mind that your system should be fully patched to fix any potential kernel bugs. Any
35
-reported kernel bugs may have already been fixed on the latest kernel packages 
32
+reported kernel bugs may have already been fixed on the latest kernel packages
36 33
 
37 34
 
38 35
 ## Install
39 36
 
40
-There are two ways to install Docker Engine.  You can use `curl` with the  `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
41
-
42
-### Install with the script
37
+There are two ways to install Docker Engine.  You can install with the `yum` package manager. Or you can use `curl` with the  `get.docker.com` site. This second method runs an installation script which also installs via the `yum` package manager.
43 38
 
39
+### Install with yum
44 40
 
45 41
 1. Log into your machine as a user with `sudo` or `root` privileges.
46 42
 
47 43
 2. Make sure your existing yum packages are up-to-date.
48 44
 
49 45
 		$ sudo yum update
50
-		
51
-3. Run the Docker installation script.
52
-		
53
-		$ curl -sSL https://get.docker.com/ | sh
54
-		
55
-		This script adds the `docker.repo` repository and installs Docker.
56
-
57
-4. Start the Docker daemon.
58 46
 
59
-		$ sudo service docker start
60
-
61
-5. Verify `docker` is installed correctly by running a test image in a container.
62
-
63
-		$ sudo docker run hello-world
64
-		Unable to find image 'hello-world:latest' locally
65
-		latest: Pulling from hello-world
66
-		a8219747be10: Pull complete 
67
-		91c95931e552: Already exists 
68
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
69
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
70
-		Status: Downloaded newer image for hello-world:latest
71
-		Hello from Docker.
72
-		This message shows that your installation appears to be working correctly.
73
-
74
-		To generate this message, Docker took the following steps:
75
-		 1. The Docker client contacted the Docker daemon.
76
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
77
-				(Assuming it was not already locally available.)
78
-		 3. The Docker daemon created a new container from that image which runs the
79
-				executable that produces the output you are currently reading.
80
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
81
-				to your terminal.
82
-
83
-		To try something more ambitious, you can run an Ubuntu container with:
84
-		 $ docker run -it ubuntu bash
85
-
86
-		For more examples and ideas, visit:
87
-		 http://docs.docker.com/userguide/
88
-
89
-### Install without the script
90
-
91
-1. Log into your machine as a user with `sudo` or `root` privileges.
92
-
93
-2. Make sure your existing yum packages are up-to-date.
94
-
95
-		$ sudo yum update
96
-    
97 47
 3. Add the yum repo yourself.
98 48
 
99
-    For Fedora 20 run:
100
-
101
-        $ cat >/etc/yum.repos.d/docker.repo <<-EOF
102
-        [dockerrepo]
103
-        name=Docker Repository
104
-        baseurl=https://yum.dockerproject.org/repo/main/fedora/20
105
-        enabled=1
106
-        gpgcheck=1
107
-        gpgkey=https://yum.dockerproject.org/gpg
108
-        EOF
109
-
110 49
     For Fedora 21 run:
111 50
 
112 51
         $ cat >/etc/yum.repos.d/docker.repo <<-EOF
... ...
@@ -132,15 +71,64 @@ There are two ways to install Docker Engine.  You can use `curl` with the  `get.
132 132
 4. Install the Docker package.
133 133
 
134 134
         $ sudo yum install docker-engine
135
-        
135
+
136 136
 5. Start the Docker daemon.
137 137
 
138 138
 		$ sudo service docker start
139 139
 
140 140
 6. Verify `docker` is installed correctly by running a test image in a container.
141 141
 
142
+
143
+        $ sudo docker run hello-world
144
+        Unable to find image 'hello-world:latest' locally
145
+        latest: Pulling from hello-world
146
+        a8219747be10: Pull complete
147
+        91c95931e552: Already exists
148
+        hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
149
+        Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
150
+        Status: Downloaded newer image for hello-world:latest
151
+        Hello from Docker.
152
+        This message shows that your installation appears to be working correctly.
153
+
154
+        To generate this message, Docker took the following steps:
155
+         1. The Docker client contacted the Docker daemon.
156
+         2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
157
+            (Assuming it was not already locally available.)
158
+         3. The Docker daemon created a new container from that image which runs the
159
+            executable that produces the output you are currently reading.
160
+         4. The Docker daemon streamed that output to the Docker client, which sent it
161
+            to your terminal.
162
+
163
+        To try something more ambitious, you can run an Ubuntu container with:
164
+         $ docker run -it ubuntu bash
165
+
166
+        For more examples and ideas, visit:
167
+         http://docs.docker.com/userguide/
168
+
169
+
170
+### Install with the script
171
+
172
+
173
+1. Log into your machine as a user with `sudo` or `root` privileges.
174
+
175
+2. Make sure your existing yum packages are up-to-date.
176
+
177
+		$ sudo yum update
178
+
179
+3. Run the Docker installation script.
180
+
181
+		$ curl -sSL https://get.docker.com/ | sh
182
+
183
+	This script adds the `docker.repo` repository and installs Docker.
184
+
185
+4. Start the Docker daemon.
186
+
187
+		$ sudo service docker start
188
+
189
+5. Verify `docker` is installed correctly by running a test image in a container.
190
+
142 191
 		$ sudo docker run hello-world
143
- 
192
+
144 193
 ## Create a docker group		
145 194
 
146 195
 The `docker` daemon binds to a Unix socket instead of a TCP port. By default
... ...
@@ -170,31 +158,7 @@ To create the `docker` group and add your user:
170 170
 4. Verify your work by running `docker` without `sudo`.
171 171
 
172 172
         $ docker run hello-world
173
-				Unable to find image 'hello-world:latest' locally
174
-				latest: Pulling from hello-world
175
-				a8219747be10: Pull complete 
176
-				91c95931e552: Already exists 
177
-				hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
178
-				Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd18681cf5daeb82aab55838d
179
-				Status: Downloaded newer image for hello-world:latest
180
-				Hello from Docker.
181
-				This message shows that your installation appears to be working correctly.
182
-
183
-				To generate this message, Docker took the following steps:
184
-				 1. The Docker client contacted the Docker daemon.
185
-				 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
186
-						(Assuming it was not already locally available.)
187
-				 3. The Docker daemon created a new container from that image which runs the
188
-						executable that produces the output you are currently reading.
189
-				 4. The Docker daemon streamed that output to the Docker client, which sent it
190
-						to your terminal.
191
-
192
-				To try something more ambitious, you can run an Ubuntu container with:
193
-				 $ docker run -it ubuntu bash
194
-
195
-				For more examples and ideas, visit:
196
-				 http://docs.docker.com/userguide/
197
- 
173
+
198 174
 ## Start the docker daemon at boot
199 175
 
200 176
 To ensure Docker starts when you boot your system, do the following:
... ...
@@ -230,17 +194,15 @@ You can uninstall the Docker software with `yum`.
230 230
 
231 231
 1. List the package you have installed.
232 232
 
233
-		$ yum list installed | grep docker
234
-		yum list installed | grep docker
235
-		docker-engine.x86_64                1.7.1-0.1.fc20
236
-																																								 @/docker-engine-1.7.1-0.1.fc20.el7.x86_64
233
+		$ yum list installed | grep docker yum list installed | grep docker
234
+		docker-engine.x86_64     1.7.1-0.1.fc21 @/docker-engine-1.7.1-0.1.fc21.el7.x86_64
237 235
 
238 236
 2. Remove the package.
239 237
 
240
-		$ sudo yum -y remove docker-engine.x86_64 
238
+		$ sudo yum -y remove docker-engine.x86_64
241 239
 
242 240
 	This command does not remove images, containers, volumes, or user-created
243
-	configuration files on your host. 
241
+	configuration files on your host.
244 242
 
245 243
 3. To delete all images, containers, and volumes, run the following command:
246 244
 
... ...
@@ -8,86 +8,143 @@ parent = "smn_linux"
8 8
 +++
9 9
 <![end-metadata]-->
10 10
 
11
-# Oracle Linux 6 and 7
11
+# Oracle Linux
12 12
 
13
-You do not require an Oracle Linux Support subscription to install Docker on
14
-Oracle Linux.
13
+Docker is supported Oracle Linux 6 and 7. You do not require an Oracle Linux
14
+Support subscription to install Docker on Oracle Linux.
15 15
 
16
-*For Oracle Linux customers with an active support subscription:*
17
-Docker is available in either the `ol6_x86_64_addons` or `ol7_x86_64_addons`
18
-channel for Oracle Linux 6 and Oracle Linux 7 on the [Unbreakable Linux Network
19
-(ULN)](https://linux.oracle.com).
16
+This page instructs you to install using Docker-managed release packages and
17
+installation mechanisms. Using these packages ensures you get the latest release
18
+of Docker. If you wish to install using Oracle-managed packages, consult your
19
+[Oracle Linux documentation](https://linux.oracle.com).
20 20
 
21
-*For Oracle Linux users without an active support subscription:*
22
-Docker is available in the appropriate `ol6_addons` or `ol7_addons` repository
23
-on [Oracle Public Yum](http://public-yum.oracle.com).
24 21
 
25
-Docker requires the use of the Unbreakable Enterprise Kernel Release 3 (3.8.13)
26
-or higher on Oracle Linux. This kernel supports the Docker btrfs storage engine
27
-on both Oracle Linux 6 and 7.
22
+## Prerequisites
28 23
 
29 24
 Due to current Docker limitations, Docker is only able to run only on the x86_64
30
-architecture.
25
+architecture. Docker requires the use of the Unbreakable Enterprise Kernel
26
+Release 3 (3.8.13) or higher on Oracle Linux. This kernel supports the Docker
27
+btrfs storage engine on both Oracle Linux 6 and 7.
31 28
 
32
-## To enable the *addons* channel via the Unbreakable Linux Network:
33 29
 
34
-1. Enable either the *ol6\_x86\_64\_addons* or *ol7\_x86\_64\_addons* channel
35
-via the ULN web interface.
36
-Consult the [Unbreakable Linux Network User's
37
-Guide](http://docs.oracle.com/cd/E52668_01/E39381/html/index.html) for
38
-documentation on subscribing to channels.
39 30
 
40
-## To enable the *addons* repository via Oracle Public Yum:
31
+## Install
41 32
 
42
-The latest release of Oracle Linux 6 and 7 are automatically configured to use
43
-the Oracle Public Yum repositories during installation. However, the *addons*
44
-repository is not enabled by default.
33
+1. Log into your machine as a user with `sudo` or `root` privileges.
45 34
 
46
-To enable the *addons* repository:
35
+2. Make sure your existing yum packages are up-to-date.
47 36
 
48
-1. Edit either `/etc/yum.repos.d/public-yum-ol6.repo` or
49
-`/etc/yum.repos.d/public-yum-ol7.repo`
50
-and set `enabled=1` in the `[ol6_addons]` or the `[ol7_addons]` stanza.
37
+        $ sudo yum update
51 38
 
52
-## Installation 
39
+3. Add the yum repo yourself.
53 40
 
54
-1. Ensure the appropriate *addons* channel or repository has been enabled.
41
+    For version 6:
55 42
 
56
-2. Use yum to install the Docker package:
43
+        $ cat >/etc/yum.repos.d/docker.repo <<-EOF
44
+        [dockerrepo]
45
+        name=Docker Repository
46
+        baseurl=https://yum.dockerproject.org/repo/main/oraclelinux/6
47
+        enabled=1
48
+        gpgcheck=1
49
+        gpgkey=https://yum.dockerproject.org/gpg
50
+        EOF
51
+
52
+    For version 7:
53
+
54
+        $ cat >/etc/yum.repos.d/docker.repo <<-EOF
55
+        [dockerrepo]
56
+        name=Docker Repository
57
+        baseurl=https://yum.dockerproject.org/repo/main/oraclelinux/7
58
+        enabled=1
59
+        gpgcheck=1
60
+        gpgkey=https://yum.dockerproject.org/gpg
61
+        EOF
62
+
63
+4. Install the Docker package.
57 64
 
58 65
         $ sudo yum install docker
59 66
 
60
-## Starting Docker 
67
+5. Start the Docker daemon.
68
+
69
+     On Oracle Linux 6:
70
+
71
+        $ sudo service docker start
72
+
73
+     On Oracle Linux 7:
74
+
75
+        $ sudo systemctl start docker.service
76
+
77
+6. Verify `docker` is installed correctly by running a test image in a container.
78
+
79
+        $ sudo docker run hello-world
80
+
81
+## Optional configurations
82
+
83
+This section contains optional procedures for configuring your Oracle Linux to work
84
+better with Docker.
61 85
 
62
-1. Now that it's installed, start the Docker daemon:
86
+* [Create a docker group](#create-a-docker-group)
87
+* [Configure Docker to start on boot](#configure-docker-to-start-on-boot)
88
+* [Use the btrfs storage engine](#use-the-btrfs-storage-engine)
63 89
 
64
-    1. On Oracle Linux 6:
90
+### Create a Docker group		
65 91
 
66
-            $ sudo service docker start
92
+The `docker` daemon binds to a Unix socket instead of a TCP port. By default
93
+that Unix socket is owned by the user `root` and other users can access it with
94
+`sudo`. For this reason, `docker` daemon always runs as the `root` user.
67 95
 
68
-    2. On Oracle Linux 7:
96
+To avoid having to use `sudo` when you use the `docker` command, create a Unix
97
+group called `docker` and add users to it. When the `docker` daemon starts, it
98
+makes the ownership of the Unix socket read/writable by the `docker` group.
69 99
 
70
-            $ sudo systemctl start docker.service
100
+>**Warning**: The `docker` group is equivalent to the `root` user; For details
101
+>on how this impacts security in your system, see [*Docker Daemon Attack
102
+>Surface*](/articles/security/#docker-daemon-attack-surface) for details.
71 103
 
72
-2. If you want the Docker daemon to start automatically at boot:
104
+To create the `docker` group and add your user:
73 105
 
74
-    1. On Oracle Linux 6:
106
+1. Log into Oracle Linux as a user with `sudo` privileges.
75 107
 
76
-            $ sudo chkconfig docker on
108
+2. Create the `docker` group and add your user.
77 109
 
78
-    2. On Oracle Linux 7:
110
+        sudo usermod -aG docker username
79 111
 
80
-            $ sudo systemctl enable docker.service
112
+3. Log out and log back in.
81 113
 
82
-**Done!**
114
+    This ensures your user is running with the correct permissions.
83 115
 
84
-## Custom daemon options
116
+4. Verify your work by running `docker` without `sudo`.
117
+
118
+        $ docker run hello-world
119
+
120
+	If this fails with a message similar to this:
121
+
122
+		Cannot connect to the Docker daemon. Is 'docker daemon' running on this host?
123
+
124
+	Check that the `DOCKER_HOST` environment variable is not set for your shell.
125
+	If it is, unset it.
126
+
127
+### Configure Docker to start on boot
128
+
129
+You can configure the  Docker daemon to start automatically at boot.
130
+
131
+On Oracle Linux 6:
132
+
133
+```
134
+$ sudo chkconfig docker on
135
+```
136
+
137
+On Oracle Linux 7:
138
+
139
+```
140
+$ sudo systemctl enable docker.service
141
+```
85 142
 
86 143
 If you need to add an HTTP Proxy, set a different directory or partition for the
87 144
 Docker runtime files, or make other customizations, read our systemd article to
88 145
 learn how to [customize your systemd Docker daemon options](/articles/systemd/).
89 146
 
90
-## Using the btrfs storage engine
147
+### Use the btrfs storage engine
91 148
 
92 149
 Docker on Oracle Linux 6 and 7 supports the use of the btrfs storage engine.
93 150
 Before enabling btrfs support, ensure that `/var/lib/docker` is stored on a
... ...
@@ -100,10 +157,10 @@ on how to create and mount btrfs filesystems.
100 100
 To enable btrfs support on Oracle Linux:
101 101
 
102 102
 1. Ensure that `/var/lib/docker` is on a btrfs filesystem.
103
-1. Edit `/etc/sysconfig/docker` and add `-s btrfs` to the `OTHER_ARGS` field.
104
-2. Restart the Docker daemon:
105 103
 
106
-You can now continue with the [Docker User Guide](/userguide/).
104
+2. Edit `/etc/sysconfig/docker` and add `-s btrfs` to the `OTHER_ARGS` field.
105
+
106
+3. Restart the Docker daemon:
107 107
 
108 108
 ## Uninstallation
109 109
 
... ...
@@ -5,19 +5,17 @@ description = "Instructions for installing Docker on Red Hat Enterprise Linux."
5 5
 keywords = ["Docker, Docker documentation, requirements, linux,  rhel"]
6 6
 [menu.main]
7 7
 parent = "smn_linux"
8
+weight = -5
8 9
 +++
9 10
 <![end-metadata]-->
10 11
 
11 12
 # Red Hat Enterprise Linux
12 13
 
13
-Docker is supported on the following versions of RHEL:
14
-
15
-- Red Hat Enterprise Linux 7
16
-
17
-This page instructs you to install using Docker-managed release packages and
18
-installation mechanisms. Using these packages ensures you get the latest release
19
-of Docker. If you wish to install using Red Hat-managed packages, consult your
20
-Red Hat release documentation for information on Red Hat's Docker support.
14
+Docker is supported on Red Hat Enterprise Linux 7. This page instructs you to
15
+install using Docker-managed release packages and installation mechanisms. Using
16
+these packages ensures you get the latest release of Docker. If you wish to
17
+install using Red Hat-managed packages, consult your Red Hat release
18
+documentation for information on Red Hat's Docker support.
21 19
 
22 20
 ## Prerequisites
23 21
 
... ...
@@ -27,7 +25,7 @@ requires that your kernel must be 3.10 at minimum, which Red Hat 7 runs.
27 27
 To check your current kernel version, open a terminal and use `uname -r` to
28 28
 display your kernel version:
29 29
 
30
-    $ uname -r 
30
+    $ uname -r
31 31
     3.10.0-229.el7.x86_64
32 32
 
33 33
 Finally, is it recommended that you fully update your system. Please keep in
... ...
@@ -37,67 +35,19 @@ packages.
37 37
 
38 38
 ## Install Docker Engine
39 39
 
40
-There are two ways to install Docker Engine.  You can use `curl` with the  `get.docker.com` site. This method runs an installation script which installs via the `yum` package manager. Or you can install with the `yum` package manager directly yourself.
41
-
42
-### Install with the script
40
+There are two ways to install Docker Engine.  You can install with the `yum` package manager directly yourself. Or you can use `curl` with the  `get.docker.com` site. This second method runs an installation script which installs via the `yum` package manager.
43 41
 
44
-You use the same installation procedure for all versions of CentOS.
42
+### Install with yum
45 43
 
46 44
 1. Log into your machine as a user with `sudo` or `root` privileges.
47 45
 
48 46
 2. Make sure your existing yum packages are up-to-date.
49 47
 
50
-		$ sudo yum update
51
-		
52
-3. Run the Docker installation script.
53
-		
54
-		$ curl -sSL https://get.docker.com/ | sh
55
-
56
-4. Start the Docker daemon.
57
-
58
-		$ sudo service docker start
59
-
60
-5. Verify `docker` is installed correctly by running a test image in a container.
61
-
62
-		$ sudo docker run hello-world
63
-		Unable to find image 'hello-world:latest' locally
64
-		latest: Pulling from hello-world
65
-		a8219747be10: Pull complete 
66
-		91c95931e552: Already exists 
67
-		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
68
-		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
69
-		Status: Downloaded newer image for hello-world:latest
70
-		Hello from Docker.
71
-		This message shows that your installation appears to be working correctly.
72
-
73
-		To generate this message, Docker took the following steps:
74
-		 1. The Docker client contacted the Docker daemon.
75
-		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
76
-				(Assuming it was not already locally available.)
77
-		 3. The Docker daemon created a new container from that image which runs the
78
-				executable that produces the output you are currently reading.
79
-		 4. The Docker daemon streamed that output to the Docker client, which sent it
80
-				to your terminal.
81
-
82
-		To try something more ambitious, you can run an Ubuntu container with:
83
-		 $ docker run -it ubuntu bash
84
-
85
-		For more examples and ideas, visit:
86
-		 http://docs.docker.com/userguide/
87
-		 
88
-### Install without the script
89
-
90
-1. Log into your machine as a user with `sudo` or `root` privileges.
91
-
92
-2. Make sure your existing yum packages are up-to-date.
48
+  		$ sudo yum update
93 49
 
94
-		$ sudo yum update
95
-    
96 50
 3. Add the yum repo yourself.
97 51
 
98
-    For RHEL 7 run:
99
-
100
-		$ cat >/etc/yum.repos.d/docker.repo <<-EOF
52
+  		$ cat >/etc/yum.repos.d/docker.repo <<-EOF
101 53
         [dockerrepo]
102 54
         name=Docker Repository
103 55
         baseurl=https://yum.dockerproject.org/repo/main/centos/7
... ...
@@ -109,7 +59,7 @@ You use the same installation procedure for all versions of CentOS.
109 109
 4. Install the Docker package.
110 110
 
111 111
         $ sudo yum install docker-engine
112
-        
112
+
113 113
 5. Start the Docker daemon.
114 114
 
115 115
 		$ sudo service docker start
... ...
@@ -117,7 +67,53 @@ You use the same installation procedure for all versions of CentOS.
117 117
 6. Verify `docker` is installed correctly by running a test image in a container.
118 118
 
119 119
 		$ sudo docker run hello-world
120
- 
120
+        Unable to find image 'hello-world:latest' locally
121
+    		latest: Pulling from hello-world
122
+    		a8219747be10: Pull complete
123
+    		91c95931e552: Already exists
124
+    		hello-world:latest: The image you are pulling has been verified. Important: image verification is a tech preview feature and should not be relied on to provide security.
125
+    		Digest: sha256:aa03e5d0d5553b4c3473e89c8619cf79df368babd1.7.1cf5daeb82aab55838d
126
+    		Status: Downloaded newer image for hello-world:latest
127
+    		Hello from Docker.
128
+    		This message shows that your installation appears to be working correctly.
129
+
130
+    		To generate this message, Docker took the following steps:
131
+    		 1. The Docker client contacted the Docker daemon.
132
+    		 2. The Docker daemon pulled the "hello-world" image from the Docker Hub.
133
+    				(Assuming it was not already locally available.)
134
+    		 3. The Docker daemon created a new container from that image which runs the
135
+    				executable that produces the output you are currently reading.
136
+    		 4. The Docker daemon streamed that output to the Docker client, which sent it
137
+    				to your terminal.
138
+
139
+    		To try something more ambitious, you can run an Ubuntu container with:
140
+    		 $ docker run -it ubuntu bash
141
+
142
+    		For more examples and ideas, visit:
143
+    		 http://docs.docker.com/userguide/
144
+
145
+### Install with the script
146
+
147
+You use the same installation procedure for all versions of CentOS.
148
+
149
+1. Log into your machine as a user with `sudo` or `root` privileges.
150
+
151
+2. Make sure your existing yum packages are up-to-date.
152
+
153
+		$ sudo yum update
154
+
155
+3. Run the Docker installation script.
156
+
157
+		$ curl -sSL https://get.docker.com/ | sh
158
+
159
+4. Start the Docker daemon.
160
+
161
+		$ sudo service docker start
162
+
163
+5. Verify `docker` is installed correctly by running a test image in a container.
164
+
165
+		$ sudo docker run hello-world
166
+
121 167
 ## Create a docker group		
122 168
 
123 169
 The `docker` daemon binds to a Unix socket instead of a TCP port. By default
... ...
@@ -147,7 +143,7 @@ To create the `docker` group and add your user:
147 147
 4. Verify your work by running `docker` without `sudo`.
148 148
 
149 149
 			$ docker run hello-world
150
- 
150
+
151 151
 ## Start the docker daemon at boot
152 152
 
153 153
 To ensure Docker starts when you boot your system, do the following:
... ...
@@ -167,15 +163,14 @@ You can uninstall the Docker software with `yum`.
167 167
 
168 168
 		$ yum list installed | grep docker
169 169
 		yum list installed | grep docker
170
-		docker-engine.x86_64                1.7.1-0.1.el7
171
-																																					 @/docker-engine-1.7.1-0.1.el7.x86_64
170
+		docker-engine.x86_64                1.7.1-0.1.el7@/docker-engine-1.7.1-0.1.el7.x86_64
172 171
 
173 172
 2. Remove the package.
174 173
 
175
-		$ sudo yum -y remove docker-engine.x86_64 
174
+		$ sudo yum -y remove docker-engine.x86_64
176 175
 
177 176
 	This command does not remove images, containers, volumes, or user created
178
-	configuration files on your host. 
177
+	configuration files on your host.
179 178
 
180 179
 3. To delete all images, containers, and volumes run the following command:
181 180
 
... ...
@@ -2,9 +2,10 @@
2 2
 +++
3 3
 title = "Installation on Ubuntu "
4 4
 description = "Instructions for installing Docker on Ubuntu. "
5
-keywords = ["Docker, Docker documentation, requirements, virtualbox, installation,  ubuntu"]
5
+keywords = ["Docker, Docker documentation, requirements, apt, installation,  ubuntu"]
6 6
 [menu.main]
7 7
 parent = "smn_linux"
8
+weight = -6
8 9
 +++
9 10
 <![end-metadata]-->
10 11
 
... ...
@@ -12,6 +13,7 @@ parent = "smn_linux"
12 12
 
13 13
 Docker is supported on these Ubuntu operating systems:
14 14
 
15
+- Ubuntu Wily 15.10
15 16
 - Ubuntu Vivid 15.04
16 17
 - Ubuntu Trusty 14.04 (LTS)
17 18
 - Ubuntu Precise 12.04 (LTS)
... ...
@@ -21,6 +23,8 @@ installation mechanisms. Using these packages ensures you get the latest release
21 21
 of Docker. If you wish to install using Ubuntu-managed packages, consult your
22 22
 Ubuntu documentation.
23 23
 
24
+>**Note**: Ubuntu Utopic 14.10 exists in Docker's `apt` repository but it is no longer officially supported.
25
+
24 26
 ## Prerequisites
25 27
 
26 28
 Docker requires a 64-bit installation regardless of your Ubuntu version.
... ...
@@ -31,26 +35,70 @@ Kernels older than 3.10 lack some of the features required to run Docker
31 31
 containers. These older versions are known to have bugs which cause data loss
32 32
 and frequently panic under certain conditions.
33 33
 
34
-To check your current kernel version, open a terminal and use `uname -r` to display
35
-your kernel version:
34
+To check your current kernel version, open a terminal and use `uname -r` to
35
+display your kernel version:
36 36
 
37 37
     $ uname -r
38 38
     3.11.0-15-generic
39 39
 
40
->**Caution** Some Ubuntu OS versions **require a version higher than 3.10** to
41
->run Docker, see the prerequisites on this page that apply to your Ubuntu
42
->version.
40
+>**Note**: If you previously installed Docker using `apt`, make sure you update
41
+your `apt` sources to the new Docker repository.
42
+
43
+### Update your apt sources
44
+
45
+Docker's `apt` repository contains Docker 1.7.1 and higher. To set `apt` to use
46
+packages from the new repository:
47
+
48
+1. If you haven't already done so, log into your Ubuntu instance.
49
+
50
+2. Open a terminal window.
51
+
52
+3. Add the new `gpg` key.
53
+
54
+        $ apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
55
+
56
+4. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor.
57
+
58
+    If the file doesn't exist, create it.
59
+
60
+5. Remove any existing entries.
61
+
62
+6. Add an entry for your Ubuntu operating system.
63
+
64
+    The possible entries are:
65
+
66
+        # Ubuntu Precise
67
+        deb https://apt.dockerproject.org/repo ubuntu-precise main
68
+        # Ubuntu Trusty
69
+        deb https://apt.dockerproject.org/repo ubuntu-trusty main
70
+        # Ubuntu Vivid
71
+        deb https://apt.dockerproject.org/repo ubuntu-vivid main
72
+        # Ubuntu Wily
73
+        deb https://apt.dockerproject.org/repo ubuntu-wily main
74
+
75
+7. Save and close the `/etc/apt/sources.list.d/docker.list` file.
76
+
77
+8. Update the `apt` package index.
43 78
 
79
+        $ apt-get update
44 80
 
45
-### For Vivid 15.04
81
+9. Purge the old repo if it exists.
46 82
 
47
-There are no prerequisites for this version.
83
+        $ apt-get purge lxc-docker*
48 84
 
49
-### For Trusty 14.04
85
+10. Verify that `apt` is pulling from the right repository.
50 86
 
51
-There are no prerequisites for this version.
87
+        $ apt-cache policy docker-engine
52 88
 
53
-### For Precise 12.04 (LTS)
89
+    From now on when you run `apt-get upgrade`, `apt` pulls from the new repository.  
90
+
91
+### Prerequisites by Ubuntu Version
92
+
93
+The following Ubuntu versions have no additional prerequisites:
94
+
95
+- Ubuntu Wily 15.10
96
+- Ubuntu Vivid 15.04
97
+- Ubuntu Trusty 14.04 (LTS)
54 98
 
55 99
 For Ubuntu Precise, Docker requires the 3.13 kernel version. If your kernel
56 100
 version is older than 3.13, you must upgrade it. Refer to this table to see
... ...
@@ -69,12 +117,13 @@ kernel, then you can skip these headers for the"trusty" kernel. If you're
69 69
 unsure, you should include this package for safety.</td> </tr> <tr> <td
70 70
 class="tg-031">xserver-xorg-lts-trusty</td> <td class="tg-031e"
71 71
 rowspan="2">Optional in non-graphical environments without Unity/Xorg.
72
-<i>Required</i> when running Docker on machine with a graphical environment.
73
-
74
-<p>To learn more about the reasons for these packages, read the installation
72
+<b>Required</b> when running Docker on machine with a graphical environment.
73
+<br>
74
+<br>To learn more about the reasons for these packages, read the installation
75 75
 instructions for backported kernels, specifically the <a
76 76
 href="https://wiki.ubuntu.com/Kernel/LTSEnablementStack" target="_blank">LTS
77
-Enablement Stack</a> &mdash; refer to note 5 under each version.</p></td> </tr>
77
+Enablement Stack</a> &mdash; refer to note 5 under each version.
78
+</td> </tr>
78 79
 <tr> <td class="tg-031">libgl1-mesa-glx-lts-trusty</td> </tr> </table> &nbsp;
79 80
 
80 81
 To upgrade your kernel and install the additional packages, do the following:
... ...
@@ -95,37 +144,24 @@ To upgrade your kernel and install the additional packages, do the following:
95 95
 
96 96
         $ sudo reboot
97 97
 
98
-5. After your system reboots, go ahead and [install Docker](#installation).
98
+5. After your system reboots, go ahead and install Docker.
99
+
99 100
 
100
-## Installation
101
+
102
+## Install
101 103
 
102 104
 Make sure you have installed the prerequisites for your Ubuntu version. Then,
103 105
 install Docker using the following:
104 106
 
105 107
 1. Log into your Ubuntu installation as a user with `sudo` privileges.
106 108
 
107
-2. Verify that you have `curl` installed.
108
-
109
-        $ which curl
110
-
111
-    If `curl` isn't installed, install it after updating your manager:
109
+2. Update your `apt` package index.
112 110
 
113 111
         $ sudo apt-get update
114
-        $ sudo apt-get install curl
115
-
116
-3. Get the latest Docker package.
117 112
 
118
-        $ curl -sSL https://get.docker.com/ | sh
113
+3. Install Docker.
119 114
 
120
-    The system prompts you for your `sudo` password. Then, it downloads and
121
-    installs Docker and its dependencies.
122
-
123
-    >**Note**: If your company is behind a filtering proxy, you may find that the
124
-    >`apt-key`
125
-    >command fails for the Docker repo during installation. To work around this,
126
-    >add the key directly using the following:
127
-    >
128
-    >       $ curl -sSL https://get.docker.com/gpg | sudo apt-key add -
115
+        $ sudo apt-get install docker-engine
129 116
 
130 117
 4. Start the `docker` daemon.
131 118
 
... ...
@@ -135,17 +171,18 @@ install Docker using the following:
135 135
 
136 136
         $ sudo docker run hello-world
137 137
 
138
-    This command downloads a test image and runs it in a container.
138
+    This command downloads a test image and runs it in a container. When the
139
+    container runs, it prints an informational message. Then, it exits.
139 140
 
140
-## Optional configurations for Docker on Ubuntu 
141
+## Optional configurations
141 142
 
142 143
 This section contains optional procedures for configuring your Ubuntu to work
143 144
 better with Docker.
144 145
 
145
-* [Create a docker group](#create-a-docker-group) 
146
-* [Adjust memory and swap accounting](#adjust-memory-and-swap-accounting) 
147
-* [Enable UFW forwarding](#enable-ufw-forwarding) 
148
-* [Configure a DNS server for use by Docker](#configure-a-dns-server-for-docker)
146
+* [Create a docker group](#create-a-docker-group)
147
+* [Adjust memory and swap accounting](#adjust-memory-and-swap-accounting)
148
+* [Enable UFW forwarding](#enable-ufw-forwarding)
149
+* [Configure a DNS server for use by Docker](#configure-a-dns-server-for-use-by-docker)
149 150
 * [Configure Docker to start on boot](#configure-docker-to-start-on-boot)
150 151
 
151 152
 ### Create a Docker group		
... ...
@@ -323,7 +360,7 @@ NetworkManager (this might slow your network).
323 323
 
324 324
 4. Restart both the NetworkManager and Docker.
325 325
 
326
-        $ sudo restart network-manager 
326
+        $ sudo restart network-manager
327 327
         $ sudo restart docker
328 328
 
329 329
 ### Configure Docker to start on boot
... ...
@@ -335,16 +372,14 @@ For `15.04` and up, to configure the `docker` daemon to start on boot, run
335 335
 
336 336
     $ sudo systemctl enable docker
337 337
 
338
-&nbsp;
339
-
340 338
 For `14.10` and below the above installation method automatically configures `upstart`
341 339
 to start the docker daemon on boot
342 340
 
343 341
 ## Upgrade Docker
344 342
 
345
-To install the latest version of Docker with `curl`:
343
+To install the latest version of Docker with `apt-get`:
346 344
 
347
-    $ curl -sSL https://get.docker.com/ | sh
345
+    $ apt-get upgrade docker-engine
348 346
 
349 347
 ## Uninstallation
350 348