Merge pull request #17861 from gissehel/apt-source-doc

explicit way to express that docker.list are different choices and not just one big file
This commit is contained in:
Sebastiaan van Stijn 2015-11-20 10:06:13 +01:00
commit 20905ec452
2 changed files with 26 additions and 14 deletions

View File

@ -63,12 +63,17 @@ from the new repository:
The possible entries are:
# Debian Wheezy
deb https://apt.dockerproject.org/repo debian-wheezy main
# Debian Jessie
deb https://apt.dockerproject.org/repo debian-jessie main
# Debian Stretch/Sid
deb https://apt.dockerproject.org/repo debian-stretch main
- On Debian Wheezy
deb https://apt.dockerproject.org/repo debian-wheezy main
- On Debian Jessie
deb https://apt.dockerproject.org/repo debian-jessie main
- On Debian Stretch/Sid
deb https://apt.dockerproject.org/repo debian-stretch main
8. Save and close the file.

View File

@ -67,14 +67,21 @@ packages from the new repository:
The possible entries are:
# Ubuntu Precise 12.04 (LTS)
deb https://apt.dockerproject.org/repo ubuntu-precise main
# Ubuntu Trusty 14.04 (LTS)
deb https://apt.dockerproject.org/repo ubuntu-trusty main
# Ubuntu Vivid 15.04
deb https://apt.dockerproject.org/repo ubuntu-vivid main
# Ubuntu Wily 15.10
deb https://apt.dockerproject.org/repo ubuntu-wily main
- On Ubuntu Precise 12.04 (LTS)
deb https://apt.dockerproject.org/repo ubuntu-precise main
- On Ubuntu Trusty 14.04 (LTS)
deb https://apt.dockerproject.org/repo ubuntu-trusty main
- On Ubuntu Vivid 15.04
deb https://apt.dockerproject.org/repo ubuntu-vivid main
- Ubuntu Wily 15.10
deb https://apt.dockerproject.org/repo ubuntu-wily main
7. Save and close the `/etc/apt/sources.list.d/docker.list` file.