Browse code

Merge pull request #7562 from jperrin/master

Updated CentOS documentation to reflect CentOS 7 install.

Fred Lifton authored on 2014/08/15 10:32:05
Showing 1 changed files
... ...
@@ -4,23 +4,31 @@ page_keywords: Docker, Docker documentation, requirements, linux, centos, epel,
4 4
 
5 5
 # CentOS
6 6
 
7
-The Docker package is available via the EPEL repository. These
8
-instructions work for CentOS 6 and later. They will likely work for
7
+While the Docker package is provided by default as part of CentOS-7, 
8
+it is provided by a community repository for CentOS-6. Please note that 
9
+this changes the installation instructions slightly between versions. 
10
+ 
11
+These instructions work for CentOS 6 and later. They will likely work for
9 12
 other binary compatible EL6 distributions such as Scientific Linux, but
10 13
 they haven't been tested.
11 14
 
12
-Please note that this package is part of [Extra Packages for Enterprise
13
-Linux (EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort
14
-to create and maintain additional packages for the RHEL distribution.
15
-
16
-Also note that due to the current Docker limitations, Docker is able to
15
+Please note that due to the current Docker limitations, Docker is able to
17 16
 run only on the **64 bit** architecture.
18 17
 
19 18
 To run Docker, you will need [CentOS6](http://www.centos.org) or higher,
20 19
 with a kernel version 2.6.32-431 or higher as this has specific kernel
21 20
 fixes to allow Docker to run.
22 21
 
23
-## Installation
22
+## Installing Docker - CentOS-7
23
+Docker is included by default in the CentOS-Extras repository. To install
24
+simply run the following command.
25
+
26
+    $ sudo yum install docker
27
+
28
+## Installing Docker - CentOS-6
29
+Please note that this for CentOS-6, this package is part of [Extra Packages
30
+for Enterprise Linux (EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort
31
+to create and maintain additional packages for the RHEL distribution.
24 32
 
25 33
 Firstly, you need to ensure you have the EPEL repository enabled. Please
26 34
 follow the [EPEL installation instructions](
... ...
@@ -39,7 +47,9 @@ will install Docker on our host.
39 39
 
40 40
     $ sudo yum install docker-io
41 41
 
42
-Now that it's installed, let's start the Docker daemon.
42
+## Using Docker
43
+
44
+Once Docker is installed, you will need to start the docker daemon.
43 45
 
44 46
     $ sudo service docker start
45 47
 
... ...
@@ -50,7 +60,7 @@ If we want Docker to start at boot, we should also:
50 50
 Now let's verify that Docker is working. First we'll need to get the latest
51 51
 `centos` image.
52 52
 
53
-    $ sudo docker pull centos:latest
53
+    $ sudo docker pull centos
54 54
 
55 55
 Next we'll make sure that we can see the image by running:
56 56
 
... ...
@@ -69,6 +79,12 @@ Run a simple bash shell to test the image:
69 69
 If everything is working properly, you'll get a simple bash prompt. Type
70 70
 exit to continue.
71 71
 
72
+## Dockerfiles
73
+The CentOS Project provides a number of sample Dockerfiles which you may use
74
+either as templates or to familiarize yourself with docker. These templates
75
+are available on github at [https://github.com/CentOS/CentOS-Dockerfiles](
76
+https://github.com/CentOS/CentOS-Dockerfiles)
77
+
72 78
 **Done!** You can either continue with the [Docker User
73 79
 Guide](/userguide/) or explore and build on the images yourself.
74 80