From 6e310517efaa09a089c9615cbecc7a14f94b9aa9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 20 Jan 2017 14:13:22 +0100 Subject: [PATCH 1/2] Use fixed $releasever for CentOS / RHEL The repo-files used in the installation instructions currently use `$releasever` to configure the right YUM repository to use, however _Server_ releases output the version in a different format (i.e., `7Server` instead of just `7`). Given that we don't have separate repositories for "Server" and "Desktop" editions, and we only support version 7, setting the repo-files to use a fixed version. This issue was originally reported in https://github.com/docker/docker/issues/23376 And fixed through 2b36087597b67b23c8309fe9330a60f17952496b, but this change got lost during the rewrite of the installation docs. Signed-off-by: Sebastiaan van Stijn --- engine/installation/linux/repo_files/centos/docker.repo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/installation/linux/repo_files/centos/docker.repo b/engine/installation/linux/repo_files/centos/docker.repo index abea668f22..a5df0b372f 100644 --- a/engine/installation/linux/repo_files/centos/docker.repo +++ b/engine/installation/linux/repo_files/centos/docker.repo @@ -1,27 +1,27 @@ [docker-main] name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/main/centos/$releasever/ +baseurl=https://yum.dockerproject.org/repo/main/centos/7/ enabled=1 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg [docker-testing] name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/testing/centos/$releasever/ +baseurl=https://yum.dockerproject.org/repo/testing/centos/7/ enabled=1 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg [docker-beta] name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/beta/centos/$releasever/ +baseurl=https://yum.dockerproject.org/repo/beta/centos/7/ enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg [docker-nightly] name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/nightly/centos/$releasever/ +baseurl=https://yum.dockerproject.org/repo/nightly/centos/7/ enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg From 1e26fa07758c553c719ce0d39159597076f0d72f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartomeu=20Mir=C3=B3?= Date: Fri, 20 Jan 2017 16:14:58 +0100 Subject: [PATCH 2/2] FIX repo URL at add-apt-repository With the past version the apt-get update results in a 403 for the docker repository when using a Jessie. Looking at the repo structure I assume that now will also work on the other Debian releases. --- engine/installation/linux/debian.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/installation/linux/debian.md b/engine/installation/linux/debian.md index 1ac661178e..8b840c2d27 100644 --- a/engine/installation/linux/debian.md +++ b/engine/installation/linux/debian.md @@ -116,8 +116,8 @@ Docker from the repository. ```bash $ sudo add-apt-repository \ - "deb https://apt.dockerproject.org/repo/pool/ \ - $(lsb_release -cs) \ + "deb https://apt.dockerproject.org/repo/ \ + debian-$(lsb_release -cs) \ main" ```