Browse code

Merge pull request #23033 from thaJeztah/docs-cherry-picks-2016-05-26

Docs cherry picks 2016 05 26

Sven Dowideit authored on 2016/05/27 07:39:54
Showing 2 changed files
... ...
@@ -16,7 +16,7 @@ Docker is supported on the following versions of Debian:
16 16
 
17 17
  - [*Debian testing stretch (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
18 18
  - [*Debian 8.0 Jessie (64-bit)*](#debian-jessie-80-64-bit)
19
- - [*Debian 7.7 Wheezy (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
19
+ - [*Debian 7.7 Wheezy (64-bit)*](#debian-wheezy-stable-7-x-64-bit) (backports required)
20 20
 
21 21
  >**Note**: If you previously installed Docker using `APT`, make sure you update
22 22
  your `APT` sources to the new `APT` repository.
... ...
@@ -36,6 +36,26 @@ Docker is supported on the following versions of Debian:
36 36
 
37 37
      $ uname -r
38 38
 
39
+ Additionally, for users of Debian Wheezy, backports must be available. To enable backports in Wheezy:
40
+ 
41
+ 1. Log into your machine and open a terminal with `sudo` or `root` privileges.
42
+ 
43
+ 2. Open the `/etc/apt/sources.list.d/backports.list` file in your favorite editor.
44
+
45
+     If the file doesn't exist, create it.
46
+ 
47
+ 3. Remove any existing entries.
48
+ 
49
+ 4. Add an entry for backports on Debian Wheezy.
50
+
51
+     An example entry:
52
+
53
+         deb http://http.debian.net/debian wheezy-backports main
54
+
55
+ 5. Update package information:
56
+
57
+         $ apt-get update
58
+
39 59
 ### Update your apt repository
40 60
 
41 61
 Docker's `APT` repository contains Docker 1.7.1 and higher. To set `APT` to use
... ...
@@ -29,13 +29,8 @@ btrfs storage engine on both Oracle Linux 6 and 7.
29 29
 > follow the installation instructions provided in the
30 30
 > [Oracle Linux documentation](https://docs.oracle.com/en/operating-systems/?tab=2).
31 31
 >
32
-> The installation instructions for Oracle Linux 6 can be found in [Chapter 10 of
33
-> the Administrator's
34
-> Solutions Guide](https://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html)
35
->
36
-> The installation instructions for Oracle Linux 7 can be found in [Chapter 29 of
37
-> the Administrator's
38
-> Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html)
32
+> The installation instructions for Oracle Linux 6 and 7 can be found in [Chapter 2 of
33
+> the Docker User's Guide](https://docs.oracle.com/cd/E52668_01/E75728/html/docker_install_upgrade.html)
39 34
 
40 35
 
41 36
 1. Log into your machine as a user with `sudo` or `root` privileges.