From fc7baf8aa8e0fe08c55d55c4e96eb6f1a8eac1a5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 20 Jan 2017 20:47:25 +0100 Subject: [PATCH] disable "testing" repos by default (#1253) The documentation describes that the "testing" repository is disabled by default; > Optional: Enable the testing repository. This repository > is included in the docker.repo file above but is disabled > by default. However, the repo-files had the testing repo enabled. This patch updates the repo-files to disable the repository by default. Signed-off-by: Sebastiaan van Stijn --- engine/installation/linux/repo_files/centos/docker.repo | 4 ++-- engine/installation/linux/repo_files/fedora/docker.repo | 2 +- engine/installation/linux/repo_files/oracle/docker-ol6.repo | 2 +- engine/installation/linux/repo_files/oracle/docker-ol7.repo | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/installation/linux/repo_files/centos/docker.repo b/engine/installation/linux/repo_files/centos/docker.repo index a5df0b372f..524da3f53b 100644 --- a/engine/installation/linux/repo_files/centos/docker.repo +++ b/engine/installation/linux/repo_files/centos/docker.repo @@ -7,8 +7,8 @@ gpgkey=https://yum.dockerproject.org/gpg [docker-testing] name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/testing/centos/7/ -enabled=1 +baseurl=https://yum.dockerproject.org/repo/testing/centos/$releasever/ +enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg diff --git a/engine/installation/linux/repo_files/fedora/docker.repo b/engine/installation/linux/repo_files/fedora/docker.repo index 77644ded98..d2b8d3854c 100644 --- a/engine/installation/linux/repo_files/fedora/docker.repo +++ b/engine/installation/linux/repo_files/fedora/docker.repo @@ -8,7 +8,7 @@ gpgkey=https://yum.dockerproject.org/gpg [docker-testing] name=Docker Repository baseurl=https://yum.dockerproject.org/repo/testing/fedora/$releasever/ -enabled=1 +enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg diff --git a/engine/installation/linux/repo_files/oracle/docker-ol6.repo b/engine/installation/linux/repo_files/oracle/docker-ol6.repo index a1d23130f1..e8b9b41852 100644 --- a/engine/installation/linux/repo_files/oracle/docker-ol6.repo +++ b/engine/installation/linux/repo_files/oracle/docker-ol6.repo @@ -8,7 +8,7 @@ gpgkey=https://yum.dockerproject.org/gpg [docker-testing] name=Docker Repository baseurl=https://yum.dockerproject.org/repo/testing/oraclelinux/6/ -enabled=1 +enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg diff --git a/engine/installation/linux/repo_files/oracle/docker-ol7.repo b/engine/installation/linux/repo_files/oracle/docker-ol7.repo index b7d462d2d0..f85fe7565f 100644 --- a/engine/installation/linux/repo_files/oracle/docker-ol7.repo +++ b/engine/installation/linux/repo_files/oracle/docker-ol7.repo @@ -8,7 +8,7 @@ gpgkey=https://yum.dockerproject.org/gpg [docker-testing] name=Docker Repository baseurl=https://yum.dockerproject.org/repo/testing/oraclelinux/7/ -enabled=1 +enabled=0 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg