Skip to content

Commit e8afc22

Browse files
SvenDowideitArnaud Porterie
SvenDowideit
authored and
Arnaud Porterie
committed
Do some major rearranging of the fedora/centos/rhel installation docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
1 parent 4e407e6 commit e8afc22

File tree

3 files changed

+123
-98
lines changed

3 files changed

+123
-98
lines changed

‎docs/sources/installation/centos.md‎

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,34 @@ page_keywords: Docker, Docker documentation, requirements, linux, centos, epel,
44

55
# CentOS
66

7-
While the Docker package is provided by default as part of CentOS-7,
8-
it is provided by the EPEL repository for CentOS-6. Please note that
9-
this changes the installation instructions slightly between versions. If you
10-
need the latest version, you can always use the latest binary which works on
11-
kernel 3.8 and above.
7+
Docker is supported on the following versions of CentOS:
128

13-
These instructions work for CentOS 6 and later. They will likely work for
14-
other binary compatible EL6 distributions such as Scientific Linux, but
15-
they haven't been tested.
9+
- [*CentOS 7 (64-bit)*](#installing-docker---centos-7)
10+
- [*CentOS 6.5 (64-bit)*](#installing-docker---centos-6.5) or later
11+
12+
These instructions are likely work for other binary compatible EL6/EL7 distributions
13+
such as Scientific Linux, but they haven't been tested.
1614

1715
Please note that due to the current Docker limitations, Docker is able to
1816
run only on the **64 bit** architecture.
1917

20-
To run Docker, you will need [CentOS6](http://www.centos.org) or higher,
21-
with a kernel version 2.6.32-431 or higher as this has specific kernel
22-
fixes to allow Docker to run.
18+
## Kernel support
19+
20+
Currently the CentOS project will only support Docker when running on kernels
21+
shipped by the distribution. There are kernel changes which will cause issues
22+
if one decides to step outside that box and run non-distribution kernel packages.
23+
24+
To run Docker on [CentOS-6.5](http://www.centos.org) or later, you will need
25+
kernel version 2.6.32-431 or higher as this has specific kernel fixes to allow
26+
Docker to run.
2327

2428
## Installing Docker - CentOS-7
2529
Docker is included by default in the CentOS-Extras repository. To install
26-
simply run the following command.
30+
run the following command:
2731

2832
$ sudo yum install docker
2933

30-
## Kernel support
31-
32-
Currently the CentOS project will only support Docker via the EPEL package when
33-
running on kernels shipped by the distribution. There are things like namespace
34-
changes which will cause issues if one decides to step outside that box and run
35-
non-distro kernel packages.
36-
37-
### Manual installation of latest version
38-
39-
While using a package is the recommended way of installing Docker,
40-
the above package might not be the latest version. If you need the latest
41-
version, [you can install the binary directly](
42-
https://docs.docker.com/installation/binaries/).
43-
44-
When installing the binary without a package, you may want
45-
to integrate Docker with systemd. For this, simply install the two unit files
46-
(service and socket) from [the github
47-
repository](https://github.com/docker/docker/tree/master/contrib/init/systemd)
48-
to `/etc/systemd/system`.
34+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
4935

5036
### FirewallD
5137

@@ -55,32 +41,49 @@ conflict with Docker.
5541
When `firewalld` is started or restarted it will remove the `DOCKER` chain
5642
from iptables, preventing Docker from working properly.
5743

58-
When using systemd, `firewalld` is started before Docker, but if you
44+
When using Systemd, `firewalld` is started before Docker, but if you
5945
start or restart `firewalld` after Docker, you will have to restart the Docker daemon.
6046

61-
## Installing Docker - CentOS-6
62-
Please note that this for CentOS-6, this package is part of [Extra Packages
63-
for Enterprise Linux (EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort
64-
to create and maintain additional packages for the RHEL distribution.
47+
## Installing Docker - CentOS-6.5
48+
49+
For Centos-6.5, the Docker package is part of [Extra Packages
50+
for Enterprise Linux (EPEL)](https://fedoraproject.org/wiki/EPEL) repository,
51+
a community effort to create and maintain additional packages for the RHEL distribution.
6552

6653
Firstly, you need to ensure you have the EPEL repository enabled. Please
6754
follow the [EPEL installation instructions](
6855
https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
6956

70-
The `docker-io` package provides Docker on EPEL.
57+
For CentOS-6, there is a package name conflict with a system tray application
58+
and its executable, so the Docker RPM package was called `docker-io`.
7159

72-
If you already have the (unrelated) `docker` package
73-
installed, it will conflict with `docker-io`.
74-
There's a [bug report](
75-
https://bugzilla.redhat.com/show_bug.cgi?id=1043676) filed for it.
76-
To proceed with `docker-io` installation, please remove `docker` first.
60+
To proceed with `docker-io` installation on CentOS-6, you may need to remove the
61+
`docker` package first.
7762

78-
Next, let's install the `docker-io` package which
79-
will install Docker on our host.
63+
$ sudo yum -y remove docker
64+
65+
Next, let's install the `docker-io` package which will install Docker on our host.
8066

8167
$ sudo yum install docker-io
8268

83-
## Using Docker
69+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
70+
71+
## Manual installation of latest Docker release
72+
73+
While using a package is the recommended way of installing Docker,
74+
the above package might not be the current release version. If you need the latest
75+
version, [you can install the binary directly](
76+
https://docs.docker.com/installation/binaries/).
77+
78+
When installing the binary without a package, you may want
79+
to integrate Docker with Systemd. For this, install the two unit files
80+
(service and socket) from [the GitHub
81+
repository](https://github.com/docker/docker/tree/master/contrib/init/systemd)
82+
to `/etc/systemd/system`.
83+
84+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
85+
86+
## Starting the Docker daemon
8487

8588
Once Docker is installed, you will need to start the docker daemon.
8689

@@ -115,13 +118,13 @@ If everything is working properly, you'll get a simple bash prompt. Type
115118
## Custom daemon options
116119

117120
If you need to add an HTTP Proxy, set a different directory or partition for the
118-
Docker runtime files, or make other customizations, read our systemd article to
119-
learn how to [customize your systemd Docker daemon options](/articles/systemd/).
121+
Docker runtime files, or make other customizations, read our Systemd article to
122+
learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
120123

121124
## Dockerfiles
122125
The CentOS Project provides a number of sample Dockerfiles which you may use
123126
either as templates or to familiarize yourself with docker. These templates
124-
are available on github at [https://github.com/CentOS/CentOS-Dockerfiles](
127+
are available on GitHub at [https://github.com/CentOS/CentOS-Dockerfiles](
125128
https://github.com/CentOS/CentOS-Dockerfiles)
126129

127130
**Done!** You can either continue with the [Docker User

‎docs/sources/installation/fedora.md‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
page_title: Installation on Fedora
2-
page_description: Installation instructions for Docker on Fedora.
3-
page_keywords: Docker, Docker documentation, Fedora, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux
2+
page_description: Instructions for installing Docker on Fedora.
3+
page_keywords: Docker, Docker documentation, Fedora, requirements, linux
44

55
# Fedora
66

7-
Docker is supported only on Fedora 20 and later,
8-
on the **64 bit** architecture.
7+
Docker is supported on the following versions of Fedora:
98

10-
## Installation
9+
- [*Fedora 20 (64-bit)*](#fedora-20-installation)
10+
- [*Fedora 21 and later (64-bit)*](#fedora-21-and-later-installation)
1111

12-
For `Fedora 20`, the `docker-io` package provides Docker.
12+
Currently the Fedora project will only support Docker when running on kernels
13+
shipped by the distribution. There are kernel changes which will cause issues
14+
if one decides to step outside that box and run non-distribution kernel packages.
1315

14-
If you have the (unrelated) `docker` package installed already, it will
15-
conflict with `docker-io`. To proceed with `docker-io` installation on
16-
Fedora 20, please remove `docker` first.
17-
18-
$ sudo yum -y remove docker
19-
$ sudo yum -y install docker-io
20-
21-
For `Fedora 21 and later`, there are no package conflicts as the system
22-
tray application and its executable have been renamed `wmdocker`.
16+
## Fedora 21 and later installation
2317

2418
Install the `docker` package which will install Docker on our host.
2519

@@ -29,6 +23,27 @@ To update the `docker` package:
2923

3024
$ sudo yum -y update docker
3125

26+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
27+
28+
## Fedora 20 installation
29+
30+
For `Fedora 20`, there is a package name conflict with a system tray application
31+
and its executable, so the Docker RPM package was called `docker-io`.
32+
33+
To proceed with `docker-io` installation on Fedora 20, please remove the `docker`
34+
package first.
35+
36+
$ sudo yum -y remove docker
37+
$ sudo yum -y install docker-io
38+
39+
To update the `docker` package:
40+
41+
$ sudo yum -y update docker-io
42+
43+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
44+
45+
## Starting the Docker daemon
46+
3247
Now that it's installed, let's start the Docker daemon.
3348

3449
$ sudo systemctl start docker
@@ -60,8 +75,8 @@ create a `docker` group, have it own `/var/run/docker.sock`, and add users to th
6075
## Custom daemon options
6176

6277
If you need to add an HTTP Proxy, set a different directory or partition for the
63-
Docker runtime files, or make other customizations, read our systemd article to
64-
learn how to [customize your systemd Docker daemon options](/articles/systemd/).
78+
Docker runtime files, or make other customizations, read our Systemd article to
79+
learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
6580

6681
## What next?
6782

‎docs/sources/installation/rhel.md‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
page_title: Installation on Red Hat Enterprise Linux
2-
page_description: Installation instructions for Docker on Red Hat Enterprise Linux.
3-
page_keywords: Docker, Docker documentation, requirements, linux, rhel, centos
2+
page_description: Instructions for installing Docker on Red Hat Enterprise Linux.
3+
page_keywords: Docker, Docker documentation, requirements, linux, rhel
44

5-
# Red Hat Enterprise Linux 7
5+
# Red Hat Enterprise Linux
66

7-
**Red Hat Enterprise Linux 7** has [shipped with
7+
Docker is supported on the following versions of RHEL:
8+
9+
- [*Red Hat Enterprise Linux 7 (64-bit)*](#red-hat-enterprise-linux-7-installation)
10+
- [*Red Hat Enterprise Linux 6.5 (64-bit)*](#red-hat-enterprise-linux-6.5-installation) or later
11+
12+
## Kernel support
13+
14+
RHEL will only support Docker via the *extras* channel or EPEL package when
15+
running on kernels shipped by the distribution. There are kernel changes which
16+
will cause issues if one decides to step outside that box and run
17+
non-distribution kernel packages.
18+
19+
## Red Hat Enterprise Linux 7 Installation
20+
21+
**Red Hat Enterprise Linux 7 (64 bit)** has [shipped with
822
Docker](https://access.redhat.com/site/products/red-hat-enterprise-linux/docker-and-containers).
923
An overview and some guidance can be found in the [Release
1024
Notes](https://access.redhat.com/site/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/7.0_Release_Notes/chap-Red_Hat_Enterprise_Linux-7.0_Release_Notes-Linux_Containers_with_Docker_Format.html).
@@ -25,51 +39,44 @@ Enterprise Linux 7](https://access.redhat.com/site/articles/881893)
2539
guide, can be found by Red Hat customers on the [Red Hat Customer
2640
Portal](https://access.redhat.com/).
2741

28-
# Red Hat Enterprise Linux 6
29-
30-
Docker is available for **RHEL** on EPEL. Please note that
31-
this package is part of [Extra Packages for Enterprise Linux
32-
(EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort to
33-
create and maintain additional packages for the RHEL distribution.
42+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
3443

35-
Also note that due to the current Docker limitations, Docker is able to
36-
run only on the **64 bit** architecture.
44+
## Red Hat Enterprise Linux 6.5 Installation
3745

38-
You will need [RHEL
39-
6.5](https://access.redhat.com/site/articles/3078#RHEL6) or higher, with
46+
You will need **64 bit** [RHEL
47+
6.5](https://access.redhat.com/site/articles/3078#RHEL6) or later, with
4048
a RHEL 6 kernel version 2.6.32-431 or higher as this has specific kernel
4149
fixes to allow Docker to work.
4250

43-
## Kernel support
44-
45-
RHEL will only support Docker via the *extras* channel or EPEL package when
46-
running on kernels shipped by the distribution. There are things like namespace
47-
changes which will cause issues if one decides to step outside that box and run
48-
non-distro kernel packages.
49-
50-
## Installation
51+
Docker is available for **RHEL6.5** on EPEL. Please note that
52+
this package is part of [Extra Packages for Enterprise Linux
53+
(EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort to
54+
create and maintain additional packages for the RHEL distribution.
5155

5256
Firstly, you need to install the EPEL repository. Please follow the
5357
[EPEL installation
5458
instructions](https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F).
5559

56-
The `docker-io` package provides Docker on EPEL.
60+
There is a package name conflict with a system tray application
61+
and its executable, so the Docker RPM package was called `docker-io`.
62+
63+
To proceed with `docker-io` installation, you may need to remove the
64+
`docker` package first.
5765

58-
If you already have the (unrelated) `docker` package
59-
installed, it will conflict with `docker-io`.
60-
There's a [bug report](
61-
https://bugzilla.redhat.com/show_bug.cgi?id=1043676) filed for it.
62-
To proceed with `docker-io` installation, please remove `docker` first.
66+
$ sudo yum -y remove docker
6367

64-
Next, let's install the `docker-io` package which
65-
will install Docker on our host.
68+
Next, let's install the `docker-io` package which will install Docker on our host.
6669

67-
$ sudo yum -y install docker-io
70+
$ sudo yum install docker-io
6871

6972
To update the `docker-io` package
7073

7174
$ sudo yum -y update docker-io
7275

76+
Please continue with the [Starting the Docker daemon](#starting-the-docker-daemon).
77+
78+
## Starting the Docker daemon
79+
7380
Now that it's installed, let's start the Docker daemon.
7481

7582
$ sudo service docker start
@@ -93,8 +100,8 @@ Continue with the [User Guide](/userguide/).
93100
## Custom daemon options
94101

95102
If you need to add an HTTP Proxy, set a different directory or partition for the
96-
Docker runtime files, or make other customizations, read our systemd article to
97-
learn how to [customize your systemd Docker daemon options](/articles/systemd/).
103+
Docker runtime files, or make other customizations, read our Systemd article to
104+
learn how to [customize your Systemd Docker daemon options](/articles/systemd/).
98105

99106

100107
## Issues?

0 commit comments

Comments
 (0)