starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-28 02:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19122 from ajneu/master

Browse Source 
documentation: debian/ubuntu need apt-transport-https ca-certificates
Upstream-commit: 954613fb248ee31ed1a919f72153eb43268f2c30
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2016-01-14 16:53:08 -08:00
parent 6f200e8423 8484c1a746
commit b7e519041b
2 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/docs/installation/debian.md
+18 -13
View File
@@ -17,8 +17,8 @@ Docker is supported on the following versions of Debian:
- [*Debian 8.0 Jessie (64-bit)*](#debian-jessie-80-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)
>**Note**: If you previously installed Docker using `apt`, make sure you update >**Note**: If you previously installed Docker using `APT`, make sure you update
your `apt` sources to the new `apt` repository. your `APT` sources to the new `APT` repository.
## Prerequisites ## Prerequisites
@@ -37,7 +37,7 @@ Docker is supported on the following versions of Debian:
### Update your apt repository ### Update your apt repository
Docker's `apt` repository contains Docker 1.7.1 and higher. To set `apt` to use Docker's `APT` repository contains Docker 1.7.1 and higher. To set `APT` to use
from the new repository: from the new repository:
1. If you haven't already done so, log into your machine as a user with `sudo` or `root` privileges. 1. If you haven't already done so, log into your machine as a user with `sudo` or `root` privileges.
@@ -49,17 +49,22 @@ from the new repository:
$ apt-get purge lxc-docker* $ apt-get purge lxc-docker*
$ apt-get purge docker.io* $ apt-get purge docker.io*
4. Add the new `gpg` key. 4. Update package information, ensure that APT works with the `https` method, and that CA certificates are installed.
$ apt-get update
$ apt-get install apt-transport-https ca-certificates
5. Add the new `GPG` key.
$ apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D $ apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
5. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor. 6. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor.
If the file doesn't exist, create it. If the file doesn't exist, create it.
6. Remove any existing entries. 7. Remove any existing entries.
7. Add an entry for your Debian operating system. 8. Add an entry for your Debian operating system.
The possible entries are: The possible entries are:
@@ -80,23 +85,23 @@ from the new repository:
> [Debian Multiarch wiki](https://wiki.debian.org/Multiarch/HOWTO#Setting_up_apt_sources) > [Debian Multiarch wiki](https://wiki.debian.org/Multiarch/HOWTO#Setting_up_apt_sources)
> for details. > for details.
8. Save and close the file. 9. Save and close the file.
9. Update the `apt` package index. 10. Update the `APT` package index.
$ apt-get update $ apt-get update
10. Verify that `apt` is pulling from the right repository. 11. Verify that `APT` is pulling from the right repository.
$ apt-cache policy docker-engine $ apt-cache policy docker-engine
From now on when you run `apt-get upgrade`, `apt` pulls from the new apt repository. From now on when you run `apt-get upgrade`, `APT` pulls from the new apt repository.
## Install Docker ## Install Docker
Before installing Docker, make sure you have set your `apt` repository correctly as described in the prerequisites. Before installing Docker, make sure you have set your `APT` repository correctly as described in the prerequisites.
1. Update the `apt` package index. 1. Update the `APT` package index.
$ sudo apt-get update $ sudo apt-get update
components/engine/docs/installation/ubuntulinux.md
+19 -14
View File
@@ -22,7 +22,7 @@ installation mechanisms. Using these packages ensures you get the latest release
of Docker. If you wish to install using Ubuntu-managed packages, consult your of Docker. If you wish to install using Ubuntu-managed packages, consult your
Ubuntu documentation. Ubuntu documentation.
>**Note**: Ubuntu Utopic 14.10 and 15.04 exist in Docker's `apt` repository but >**Note**: Ubuntu Utopic 14.10 and 15.04 exist in Docker's `APT` repository but
> are no longer officially supported. > are no longer officially supported.
## Prerequisites ## Prerequisites
@@ -41,29 +41,34 @@ display your kernel version:
$ uname -r $ uname -r
3.11.0-15-generic 3.11.0-15-generic
>**Note**: If you previously installed Docker using `apt`, make sure you update >**Note**: If you previously installed Docker using `APT`, make sure you update
your `apt` sources to the new Docker repository. your `APT` sources to the new Docker repository.
### Update your apt sources ### Update your apt sources
Docker's `apt` repository contains Docker 1.7.1 and higher. To set `apt` to use Docker's `APT` repository contains Docker 1.7.1 and higher. To set `APT` to use
packages from the new repository: packages from the new repository:
1. If you haven't already done so, log into your Ubuntu instance as a privileged user. 1. If you haven't already done so, log into your Ubuntu instance as a privileged user.
2. Open a terminal window. 2. Open a terminal window.
3. Add the new `gpg` key. 3. Update package information, ensure that APT works with the `https` method, and that CA certificates are installed.
$ apt-get update
$ apt-get install apt-transport-https ca-certificates
4. Add the new `GPG` key.
$ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D $ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
4. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor. 5. Open the `/etc/apt/sources.list.d/docker.list` file in your favorite editor.
If the file doesn't exist, create it. If the file doesn't exist, create it.
5. Remove any existing entries. 6. Remove any existing entries.
6. Add an entry for your Ubuntu operating system. 7. Add an entry for your Ubuntu operating system.
The possible entries are: The possible entries are:
@@ -84,21 +89,21 @@ packages from the new repository:
> [Debian Multiarch wiki](https://wiki.debian.org/Multiarch/HOWTO#Setting_up_apt_sources) > [Debian Multiarch wiki](https://wiki.debian.org/Multiarch/HOWTO#Setting_up_apt_sources)
> for details. > for details.
7. Save and close the `/etc/apt/sources.list.d/docker.list` file. 8. Save and close the `/etc/apt/sources.list.d/docker.list` file.
8. Update the `apt` package index. 9. Update the `APT` package index.
$ apt-get update $ apt-get update
9. Purge the old repo if it exists. 10. Purge the old repo if it exists.
$ apt-get purge lxc-docker $ apt-get purge lxc-docker
10. Verify that `apt` is pulling from the right repository. 11. Verify that `APT` is pulling from the right repository.
$ apt-cache policy docker-engine $ apt-cache policy docker-engine
From now on when you run `apt-get upgrade`, `apt` pulls from the new repository. From now on when you run `apt-get upgrade`, `APT` pulls from the new repository.
### Prerequisites by Ubuntu Version ### Prerequisites by Ubuntu Version
@@ -183,7 +188,7 @@ install Docker using the following:
1. Log into your Ubuntu installation as a user with `sudo` privileges. 1. Log into your Ubuntu installation as a user with `sudo` privileges.
2. Update your `apt` package index. 2. Update your `APT` package index.
$ sudo apt-get update $ sudo apt-get update