Merge pull request #12133 from xiaods/fixed-issue-11500

fixed #11500 Add tip about filter proxy
This commit is contained in:
moxiegirl 2015-04-08 09:09:54 -07:00
Родитель a6d39e2a2d a40f379878
Коммит 254d6f7752
2 изменённых файлов: 14 добавлений и 1 удалений

Просмотреть файл

@ -62,9 +62,16 @@ which is officially supported by Docker.
2. Restart your system. This is necessary for Debian to use your new kernel. 2. Restart your system. This is necessary for Debian to use your new kernel.
3. Install Docker using the get.docker.com script: 3. Install Docker using the get.docker.com script:
`curl -sSL https://get.docker.com/ | sh` `curl -sSL https://get.docker.com/ | sh`
>**Note**: If your company is behind a filtering proxy, you may find that the
>`apt-key`
>command fails for the Docker repo during installation. To work around this,
>add the key directly using the following:
>
> $ wget -qO- https://get.docker.com/gpg | sudo apt-key add -
## Giving non-root access ## Giving non-root access
The `docker` daemon always runs as the `root` user and the `docker` The `docker` daemon always runs as the `root` user and the `docker`

Просмотреть файл

@ -114,6 +114,12 @@ install Docker using the following:
The system prompts you for your `sudo` password. Then, it downloads and The system prompts you for your `sudo` password. Then, it downloads and
installs Docker and its dependencies. installs Docker and its dependencies.
>**Note**: If your company is behind a filtering proxy, you may find that the
>`apt-key`
>command fails for the Docker repo during installation. To work around this,
>add the key directly using the following:
>
> $ wget -qO- https://get.docker.com/gpg | sudo apt-key add -
4. Verify `docker` is installed correctly. 4. Verify `docker` is installed correctly.