summaryrefslogtreecommitdiff
path: root/docs/sources/installation
diff options
context:
space:
mode:
Diffstat (limited to 'docs/sources/installation')
-rw-r--r--docs/sources/installation/centos.md62
-rw-r--r--docs/sources/installation/fedora.md2
-rw-r--r--docs/sources/installation/gentoolinux.md3
-rw-r--r--docs/sources/installation/google.md2
-rw-r--r--docs/sources/installation/openSUSE.md20
-rw-r--r--docs/sources/installation/oracle.md120
-rw-r--r--docs/sources/installation/softlayer.md24
-rw-r--r--docs/sources/installation/ubuntulinux.md13
8 files changed, 217 insertions, 29 deletions
diff --git a/docs/sources/installation/centos.md b/docs/sources/installation/centos.md
index 3966d0f092..2f7d57d604 100644
--- a/docs/sources/installation/centos.md
+++ b/docs/sources/installation/centos.md
@@ -4,23 +4,57 @@ page_keywords: Docker, Docker documentation, requirements, linux, centos, epel,
# CentOS
-The Docker package is available via the EPEL repository. These
-instructions work for CentOS 6 and later. They will likely work for
+While the Docker package is provided by default as part of CentOS-7,
+it is provided by the EPEL repository for CentOS-6. Please note that
+this changes the installation instructions slightly between versions. If you
+need the latest version, you can always use the latest binary which works on
+kernel 3.8 and above.
+
+These instructions work for CentOS 6 and later. They will likely work for
other binary compatible EL6 distributions such as Scientific Linux, but
they haven't been tested.
-Please note that this package is part of [Extra Packages for Enterprise
-Linux (EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort
-to create and maintain additional packages for the RHEL distribution.
-
-Also note that due to the current Docker limitations, Docker is able to
+Please note that due to the current Docker limitations, Docker is able to
run only on the **64 bit** architecture.
To run Docker, you will need [CentOS6](http://www.centos.org) or higher,
with a kernel version 2.6.32-431 or higher as this has specific kernel
fixes to allow Docker to run.
-## Installation
+## Installing Docker - CentOS-7
+Docker is included by default in the CentOS-Extras repository. To install
+simply run the following command.
+
+ $ sudo yum install docker
+
+### Manual installation of latest version
+
+While using a package is the recommended way of installing Docker,
+the above package might not be the latest version. If you need the latest
+version, [you can install the binary directly](
+https://docs.docker.com/installation/binaries/).
+
+When installing the binary without a package, you may want
+to integrate Docker with systemd. For this, simply install the two unit files
+(service and socket) from [the github
+repository](https://github.com/docker/docker/tree/master/contrib/init/systemd)
+to `/etc/systemd/system`.
+
+### FirewallD
+
+CentOS-7 introduced firewalld, which is a wrapper around iptables and can
+conflict with Docker.
+
+When firewalld is started or restarted it will remove the `DOCKER` chain
+from iptables, preventing Docker from working properly.
+
+When using systemd, firewalld is started before Docker, but if you
+start or restart firewalld after Docker, you will have to restart the Docker daemon.
+
+## Installing Docker - CentOS-6
+Please note that this for CentOS-6, this package is part of [Extra Packages
+for Enterprise Linux (EPEL)](https://fedoraproject.org/wiki/EPEL), a community effort
+to create and maintain additional packages for the RHEL distribution.
Firstly, you need to ensure you have the EPEL repository enabled. Please
follow the [EPEL installation instructions](
@@ -39,7 +73,9 @@ will install Docker on our host.
$ sudo yum install docker-io
-Now that it's installed, let's start the Docker daemon.
+## Using Docker
+
+Once Docker is installed, you will need to start the docker daemon.
$ sudo service docker start
@@ -50,7 +86,7 @@ If we want Docker to start at boot, we should also:
Now let's verify that Docker is working. First we'll need to get the latest
`centos` image.
- $ sudo docker pull centos:latest
+ $ sudo docker pull centos
Next we'll make sure that we can see the image by running:
@@ -69,6 +105,12 @@ Run a simple bash shell to test the image:
If everything is working properly, you'll get a simple bash prompt. Type
exit to continue.
+## Dockerfiles
+The CentOS Project provides a number of sample Dockerfiles which you may use
+either as templates or to familiarize yourself with docker. These templates
+are available on github at [https://github.com/CentOS/CentOS-Dockerfiles](
+https://github.com/CentOS/CentOS-Dockerfiles)
+
**Done!** You can either continue with the [Docker User
Guide](/userguide/) or explore and build on the images yourself.
diff --git a/docs/sources/installation/fedora.md b/docs/sources/installation/fedora.md
index a230aa6cf5..757b3e9c44 100644
--- a/docs/sources/installation/fedora.md
+++ b/docs/sources/installation/fedora.md
@@ -68,7 +68,7 @@ and above.
If you are behind a HTTP proxy server, for example in corporate settings,
you will need to add this configuration in the Docker *systemd service file*.
-Edit file `/lib/systemd/system/docker.service`. Add the following to
+Edit file `/usr/lib/systemd/system/docker.service`. Add the following to
section `[Service]` :
Environment="HTTP_PROXY=http://proxy.example.com:80/"
diff --git a/docs/sources/installation/gentoolinux.md b/docs/sources/installation/gentoolinux.md
index 62fdc9f00e..ac92ad39c8 100644
--- a/docs/sources/installation/gentoolinux.md
+++ b/docs/sources/installation/gentoolinux.md
@@ -39,6 +39,9 @@ and especially missing kernel configuration flags and/or dependencies,
https://github.com/tianon/docker-overlay/issues) or ping
tianon directly in the #docker IRC channel on the freenode network.
+Other use flags are described in detail on [tianon's
+blog](https://tianon.github.io/post/2014/05/17/docker-on-gentoo.html).
+
## Starting Docker
Ensure that you are running a kernel that includes all the necessary
diff --git a/docs/sources/installation/google.md b/docs/sources/installation/google.md
index fa2fa61fc9..23a9bfbfb8 100644
--- a/docs/sources/installation/google.md
+++ b/docs/sources/installation/google.md
@@ -20,7 +20,7 @@ page_keywords: Docker, Docker documentation, installation, google, Google Comput
(select a zone close to you and the desired instance size)
$ gcloud compute instances create docker-playground \
- --image container-vm-v20140710 \
+ --image container-vm-v20140730 \
--image-project google-containers \
--zone us-central1-a \
--machine-type f1-micro
diff --git a/docs/sources/installation/openSUSE.md b/docs/sources/installation/openSUSE.md
index c03c74a811..951b8770cc 100644
--- a/docs/sources/installation/openSUSE.md
+++ b/docs/sources/installation/openSUSE.md
@@ -47,13 +47,27 @@ The docker package creates a new group named docker. Users, other than
root user, need to be part of this group in order to interact with the
Docker daemon. You can add users with:
- $ sudo usermod -a -G docker <username>
+ $ sudo /usr/sbin/usermod -a -G docker <username>
To verify that everything has worked as expected:
- $ sudo docker run --rm -i -t ubuntu /bin/bash
+ $ sudo docker run --rm -i -t opensuse /bin/bash
+
+This should download and import the `opensuse` image, and then start `bash` in
+a container. To exit the container type `exit`.
+
+If you want your containers to be able to access the external network you must
+enable the `net.ipv4.ip_forward` rule.
+This can be done using YaST by browsing to the
+`Network Devices -> Network Settings -> Routing` menu and ensuring that the
+`Enable IPv4 Forwarding` box is checked.
+
+This option cannot be changed when networking is handled by the Network Manager.
+In such cases the `/etc/sysconfig/SuSEfirewall2` file needs to be edited by
+hand to ensure the `FW_ROUTE` flag is set to `yes` like so:
+
+ FW_ROUTE="yes"
-This should download and import the `ubuntu` image, and then start `bash` in a container. To exit the container type `exit`.
**Done!**
diff --git a/docs/sources/installation/oracle.md b/docs/sources/installation/oracle.md
new file mode 100644
index 0000000000..05bb3d9808
--- /dev/null
+++ b/docs/sources/installation/oracle.md
@@ -0,0 +1,120 @@
+page_title: Installation on Oracle Linux
+page_description: Installation instructions for Docker on Oracle Linux.
+page_keywords: Docker, Docker documentation, requirements, linux, rhel, centos, oracle, ol
+
+# Oracle Linux 6 and 7
+
+You do not require an Oracle Linux Support subscription to install Docker on
+Oracle Linux.
+
+*For Oracle Linux customers with an active support subscription:*
+Docker is available in either the `ol6_x86_64_addons` or `ol7_x86_64_addons`
+channel for Oracle Linux 6 and Oracle Linux 7 on the [Unbreakable Linux Network
+(ULN)](https://linux.oracle.com).
+
+*For Oracle Linux users without an active support subscription:*
+Docker is available in the appropriate `ol6_addons` or `ol7_addons` repository
+on [Oracle Public Yum](http://public-yum.oracle.com).
+
+Docker requires the use of the Unbreakable Enterprise Kernel Release 3 (3.8.13)
+or higher on Oracle Linux. This kernel supports the Docker btrfs storage engine
+on both Oracle Linux 6 and 7.
+
+Due to current Docker limitations, Docker is only able to run only on the x86_64
+architecture.
+
+## To enable the *addons* channel via the Unbreakable Linux Network:
+
+1. Enable either the *ol6\_x86\_64\_addons* or *ol7\_x86\_64\_addons* channel
+via the ULN web interface.
+Consult the [Unbreakable Linux Network User's
+Guide](http://docs.oracle.com/cd/E52668_01/E39381/html/index.html) for
+documentation on subscribing to channels.
+
+## To enable the *addons* repository via Oracle Public Yum:
+
+The latest release of Oracle Linux 6 and 7 are automatically configured to use
+the Oracle Public Yum repositories during installation. However, the *addons*
+repository is not enabled by default.
+
+To enable the *addons* repository:
+
+1. Edit either `/etc/yum.repos.d/public-yum-ol6.repo` or
+`/etc/yum.repos.d/public-yum-ol7.repo`
+and set `enabled=1` in the `[ol6_addons]` or the `[ol7_addons]` stanza.
+
+## To install Docker:
+
+1. Ensure the appropriate *addons* channel or repository has been enabled.
+
+2. Use yum to install the Docker package:
+
+ $ sudo yum install docker
+
+## To start Docker:
+
+1. Now that it's installed, start the Docker daemon:
+
+ 1. On Oracle Linux 6:
+
+ $ sudo service docker start
+
+ 2. On Oracle Linux 7:
+
+ $ sudo systemctl start docker.service
+
+2. If you want the Docker daemon to start automatically at boot:
+
+ 1. On Oracle Linux 6:
+
+ $ sudo chkconfig docker on
+
+ 2. On Oracle Linux 7:
+
+ $ sudo systemctl enable docker.service
+
+**Done!**
+
+## Using the btrfs storage engine
+
+Docker on Oracle Linux 6 and 7 supports the use of the btrfs storage engine.
+Before enabling btrfs support, ensure that `/var/lib/docker` is stored on a
+btrfs-based filesystem. Review [Chapter
+5](http://docs.oracle.com/cd/E37670_01/E37355/html/ol_btrfs.html) of the [Oracle
+Linux Administrator's Solution
+Guide](http://docs.oracle.com/cd/E37670_01/E37355/html/index.html) for details
+on how to create and mount btrfs filesystems.
+
+To enable btrfs support on Oracle Linux:
+
+1. Ensure that `/var/lib/docker` is on a btrfs filesystem.
+1. Edit `/etc/sysconfig/docker` and add `-s btrfs` to the `OTHER_ARGS` field.
+2. Restart the Docker daemon:
+
+You can now continue with the [Docker User Guide](/userguide/).
+
+## Known issues
+
+### Docker unmounts btrfs filesystem on shutdown
+If you're running Docker using the btrfs storage engine and you stop the Docker
+service, it will unmount the btrfs filesystem during the shutdown process. You
+should ensure the filesystem is mounted properly prior to restarting the Docker
+service.
+
+On Oracle Linux 7, you can use a `systemd.mount` definition and modify the
+Docker `systemd.service` to depend on the btrfs mount defined in systemd.
+
+### SElinux Support on Oracle Linux 7
+SElinux must be set to `Permissive` or `Disabled` in `/etc/sysconfig/selinux` to
+use the btrfs storage engine on Oracle Linux 7.
+
+## Further issues?
+
+If you have a current Basic or Premier Support Subscription for Oracle Linux,
+you can report any issues you have with the installation of Docker via a Service
+Request at [My Oracle Support](http://support.oracle.com).
+
+If you do not have an Oracle Linux Support Subscription, you can use the [Oracle
+Linux
+Forum](https://community.oracle.com/community/server_%26_storage_systems/linux/
+oracle_linux) for community-based support.
diff --git a/docs/sources/installation/softlayer.md b/docs/sources/installation/softlayer.md
index d01866720c..d594896a92 100644
--- a/docs/sources/installation/softlayer.md
+++ b/docs/sources/installation/softlayer.md
@@ -6,22 +6,22 @@ page_keywords: IBM SoftLayer, virtualization, cloud, docker, documentation, inst
1. Create an [IBM SoftLayer account](
https://www.softlayer.com/cloud-servers/).
-2. Log in to the [SoftLayer Console](
- https://control.softlayer.com/devices/).
-3. Go to [Order Hourly Computing Instance Wizard](
- https://manage.softlayer.com/Sales/orderHourlyComputingInstance)
- on your SoftLayer Console.
-4. Create a new *CloudLayer Computing Instance* (CCI) using the default
+2. Log in to the [SoftLayer Customer Portal](
+ https://control.softlayer.com/).
+3. From the *Devices* menu select [*Device List*](https://control.softlayer.com/devices)
+4. Click *Order Devices* on the top right of the window below the menu bar.
+5. Under *Virtual Server* click [*Hourly*](https://manage.softlayer.com/Sales/orderHourlyComputingInstance)
+6. Create a new *SoftLayer Virtual Server Instance* (VSI) using the default
values for all the fields and choose:
- - *First Available* as `Datacenter` and
+ - The desired location for *Datacenter*
- *Ubuntu Linux 12.04 LTS Precise Pangolin - Minimal Install (64 bit)*
- as `Operating System`.
+ for *Operating System*.
-5. Click the *Continue Your Order* button at the bottom right and
- select *Go to checkout*.
-6. Insert the required *User Metadata* and place the order.
-7. Then continue with the [*Ubuntu*](../ubuntulinux/#ubuntu-linux)
+7. Click the *Continue Your Order* button at the bottom right.
+8. Fill out VSI *hostname* and *domain*.
+9. Insert the required *User Metadata* and place the order.
+10. Then continue with the [*Ubuntu*](../ubuntulinux/#ubuntu-linux)
instructions.
## What next?
diff --git a/docs/sources/installation/ubuntulinux.md b/docs/sources/installation/ubuntulinux.md
index 5ddc791f4f..fb8fdf66b7 100644
--- a/docs/sources/installation/ubuntulinux.md
+++ b/docs/sources/installation/ubuntulinux.md
@@ -87,9 +87,18 @@ VirtualBox guest additions. If you didn't install the headers for your
"precise" kernel, then you can skip these headers for the "raring"
kernel. But it is safer to include them if you're not sure.
+Please read the installation instructions for backported kernels at
+Ubuntu.org to understand why you also need to install the Xorg packages
+when running Docker on a machine with a graphical environment like Unity.
+[LTS Enablement Stack](https://wiki.ubuntu.com/Kernel/LTSEnablementStack) refer to note 5 under
+each version.
+
# install the backported kernel
$ sudo apt-get update
$ sudo apt-get install linux-image-generic-lts-raring linux-headers-generic-lts-raring
+
+ # install the backported kernel and xorg if using Unity/Xorg
+ $ sudo apt-get install --install-recommends linux-generic-lts-raring xserver-xorg-lts-raring libgl1-mesa-glx-lts-raring
# reboot
$ sudo reboot
@@ -266,11 +275,11 @@ These parameters will help you get rid of the following warnings:
## Troubleshooting
-On Linux Mint, the `cgroup-lite` package is not
+On Linux Mint, the `cgroup-lite` and `apparmor` packages are not
installed by default. Before Docker will work correctly, you will need
to install this via:
- $ sudo apt-get update && sudo apt-get install cgroup-lite
+ $ sudo apt-get update && sudo apt-get install cgroup-lite apparmor
## Docker and UFW