Merge branch 'master' into patch-1

This commit is contained in:
Misty Stanley-Jones 2017-01-20 09:50:52 -08:00 committed by GitHub
commit 2f2bcbe1b2
2 changed files with 6 additions and 6 deletions

View File

@ -116,8 +116,8 @@ Docker from the repository.
```bash ```bash
$ sudo add-apt-repository \ $ sudo add-apt-repository \
"deb https://apt.dockerproject.org/repo/pool/ \ "deb https://apt.dockerproject.org/repo/ \
$(lsb_release -cs) \ debian-$(lsb_release -cs) \
main" main"
``` ```

View File

@ -1,27 +1,27 @@
[docker-main] [docker-main]
name=Docker Repository name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/main/centos/$releasever/ baseurl=https://yum.dockerproject.org/repo/main/centos/7/
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
[docker-testing] [docker-testing]
name=Docker Repository name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/testing/centos/$releasever/ baseurl=https://yum.dockerproject.org/repo/testing/centos/7/
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
[docker-beta] [docker-beta]
name=Docker Repository name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/beta/centos/$releasever/ baseurl=https://yum.dockerproject.org/repo/beta/centos/7/
enabled=0 enabled=0
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg
[docker-nightly] [docker-nightly]
name=Docker Repository name=Docker Repository
baseurl=https://yum.dockerproject.org/repo/nightly/centos/$releasever/ baseurl=https://yum.dockerproject.org/repo/nightly/centos/7/
enabled=0 enabled=0
gpgcheck=1 gpgcheck=1
gpgkey=https://yum.dockerproject.org/gpg gpgkey=https://yum.dockerproject.org/gpg