Merge branch 'stefanwuthrich-patch-1'

This commit is contained in:
John Mulhausen 2016-11-28 15:00:06 -08:00
commit c49c5ec2c6
1 changed files with 3 additions and 1 deletions

View File

@ -13,6 +13,7 @@ Docker is supported on these Ubuntu operating systems:
- Ubuntu Wily 15.10 - Ubuntu Wily 15.10
- Ubuntu Trusty 14.04 (LTS) - Ubuntu Trusty 14.04 (LTS)
- Ubuntu Precise 12.04 (LTS) - Ubuntu Precise 12.04 (LTS)
- Ubuntu Yakkety 16.10 (LTS)
This page instructs you to install Docker on Ubuntu, using packages provided by This page instructs you to install Docker on Ubuntu, using packages provided by
Docker. Using these packages ensures you get the latest official Docker. Using these packages ensures you get the latest official
@ -76,6 +77,7 @@ To set `APT` to use packages from the Docker repository:
| Trusty 14.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-trusty main` | | Trusty 14.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-trusty main` |
| Wily 15.10 | `deb https://apt.dockerproject.org/repo ubuntu-wily main` | | Wily 15.10 | `deb https://apt.dockerproject.org/repo ubuntu-wily main` |
| Xenial 16.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-xenial main` | | Xenial 16.04 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-xenial main` |
| Yakkety 16.10 (LTS) | `deb https://apt.dockerproject.org/repo ubuntu-yakkety main` |
>**Note**: Docker does not provide packages for all architectures. Binary artifacts >**Note**: Docker does not provide packages for all architectures. Binary artifacts
@ -618,4 +620,4 @@ following command:
$ rm -rf /var/lib/docker $ rm -rf /var/lib/docker
``` ```
You must delete any customized configuration files manually. You must delete any edited configuration files manually.