From d27f1bb00006fc936c0cb393c93131427e68fef6 Mon Sep 17 00:00:00 2001 From: Vishal Doshi Date: Sun, 24 Aug 2014 15:48:56 +0530 Subject: [PATCH 1/2] Update debian.md Add some instructions for Debian 7 (aka Wheezy/Stable) Signed-off-by: Vishal Doshi --- docs/sources/installation/debian.md | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index 0da2f2f5d0..cf9da69b42 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -7,6 +7,7 @@ page_keywords: Docker, Docker documentation, installation, debian Docker is supported on the following versions of Debian: - [*Debian 8.0 Jessie (64-bit)*](#debian-jessie-8-64-bit) + - [*Debian 7.5 Wheezy (64-bit)*](#debian-wheezy-7-64-bit) ## Debian Jessie 8.0 (64-bit) @@ -34,7 +35,30 @@ Which should download the `ubuntu` image, and then start `bash` in a container. > If you want to enable memory and swap accounting see > [this](/installation/ubuntulinux/#memory-and-swap-accounting). -### Giving non-root access +## Debian Wheezy/Stable 7.x (64-bit) + +Docker requires Kernel 3.8+, while Wheezy ships with Kernel 3.2 (for more details on why 3.8 is required, see discussion on [bug #407](https://github.com/docker/docker/issues/407%20kernel%20versions)). + +Fortunately, wheezy-backports currently has [Kernel 3.14](https://packages.debian.org/search?suite=wheezy-backports§ion=all&arch=any&searchon=names&keywords=linux-image-amd64), which is officially supported by Docker. + +### Installation + + 1. Install Kernel 3.14 from wheezy-backports + + Add the following line to your `/etc/apt/sources.list` + + `deb http://http.debian.net/debian wheezy-backports main` + + then install the `linux-image-amd64` package (note the use of `-t wheezy-backports`) + + $ sudo apt-get update + $ sudo apt-get install -t wheezy-backports linux-image-amd64 + + 2. Install Docker using the get.docker.io script: + + `curl -sSL https://get.docker.io/ | sh` + +## Giving non-root access The `docker` daemon always runs as the `root` user and the `docker` daemon binds to a Unix socket instead of a TCP port. By default that @@ -68,7 +92,7 @@ use the `-G` flag to specify an alternative group. # Restart the Docker daemon. $ sudo service docker restart + ## What next? Continue with the [User Guide](/userguide/). - From 2852037018e435dc61a27725a307595a6f57da40 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 1 Sep 2014 09:55:53 +1000 Subject: [PATCH 2/2] Try to go for 80-char lines and a little md wrangling. Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/sources/installation/debian.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/docs/sources/installation/debian.md b/docs/sources/installation/debian.md index cf9da69b42..e1416685b6 100644 --- a/docs/sources/installation/debian.md +++ b/docs/sources/installation/debian.md @@ -37,26 +37,31 @@ Which should download the `ubuntu` image, and then start `bash` in a container. ## Debian Wheezy/Stable 7.x (64-bit) -Docker requires Kernel 3.8+, while Wheezy ships with Kernel 3.2 (for more details on why 3.8 is required, see discussion on [bug #407](https://github.com/docker/docker/issues/407%20kernel%20versions)). +Docker requires Kernel 3.8+, while Wheezy ships with Kernel 3.2 (for more details +on why 3.8 is required, see discussion on +[bug #407](https://github.com/docker/docker/issues/407%20kernel%20versions)). -Fortunately, wheezy-backports currently has [Kernel 3.14](https://packages.debian.org/search?suite=wheezy-backports§ion=all&arch=any&searchon=names&keywords=linux-image-amd64), which is officially supported by Docker. +Fortunately, wheezy-backports currently has [Kernel 3.14 +](https://packages.debian.org/search?suite=wheezy-backports§ion=all&arch=any&searchon=names&keywords=linux-image-amd64), +which is officially supported by Docker. ### Installation - 1. Install Kernel 3.14 from wheezy-backports +1. Install Kernel 3.14 from wheezy-backports - Add the following line to your `/etc/apt/sources.list` + Add the following line to your `/etc/apt/sources.list` - `deb http://http.debian.net/debian wheezy-backports main` + `deb http://http.debian.net/debian wheezy-backports main` - then install the `linux-image-amd64` package (note the use of `-t wheezy-backports`) + then install the `linux-image-amd64` package (note the use of + `-t wheezy-backports`) - $ sudo apt-get update - $ sudo apt-get install -t wheezy-backports linux-image-amd64 + $ sudo apt-get update + $ sudo apt-get install -t wheezy-backports linux-image-amd64 - 2. Install Docker using the get.docker.io script: +2. Install Docker using the get.docker.io script: - `curl -sSL https://get.docker.io/ | sh` + `curl -sSL https://get.docker.io/ | sh` ## Giving non-root access