beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Docs cherry picks 2016 05 26
This commit is contained in:
Sven Dowideit 2016-05-26 15:39:54 -07:00
commit b0e27887f2
2 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
docs/installation/linux/debian.md
View file

@ -16,7 +16,7 @@ Docker is supported on the following versions of Debian:
- [*Debian testing stretch (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
- [*Debian 8.0 Jessie (64-bit)*](#debian-jessie-80-64-bit)
- [*Debian 7.7 Wheezy (64-bit)*](#debian-wheezy-stable-7-x-64-bit)
- [*Debian 7.7 Wheezy (64-bit)*](#debian-wheezy-stable-7-x-64-bit) (backports required)
>**Note**: If you previously installed Docker using `APT`, make sure you update
your `APT` sources to the new `APT` repository.
@ -36,6 +36,26 @@ Docker is supported on the following versions of Debian:
$ uname -r
Additionally, for users of Debian Wheezy, backports must be available. To enable backports in Wheezy:
1. Log into your machine and open a terminal with `sudo` or `root` privileges.
2. Open the `/etc/apt/sources.list.d/backports.list` file in your favorite editor.
If the file doesn't exist, create it.
3. Remove any existing entries.
4. Add an entry for backports on Debian Wheezy.
An example entry:
deb http://http.debian.net/debian wheezy-backports main
5. Update package information:
$ apt-get update
### Update your apt repository
Docker's `APT` repository contains Docker 1.7.1 and higher. To set `APT` to use

9
docs/installation/linux/oracle.md
View file

@ -29,13 +29,8 @@ btrfs storage engine on both Oracle Linux 6 and 7.
> follow the installation instructions provided in the
> [Oracle Linux documentation](https://docs.oracle.com/en/operating-systems/?tab=2).
>
> The installation instructions for Oracle Linux 6 can be found in [Chapter 10 of
> the Administrator's
> Solutions Guide](https://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html)
>
> The installation instructions for Oracle Linux 7 can be found in [Chapter 29 of
> the Administrator's
> Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html)
> The installation instructions for Oracle Linux 6 and 7 can be found in [Chapter 2 of
> the Docker User's Guide](https://docs.oracle.com/cd/E52668_01/E75728/html/docker_install_upgrade.html)
1. Log into your machine as a user with `sudo` or `root` privileges.