deactivates new `docker-ce-stable` yum repository by default.

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index 1028c49..65fbad2 100644 (file)
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # docker-grid CHANGELOG
 
+1.1.0
+-----
+- deactivates new `docker-ce-stable` yum repository by default.
+
 1.0.0
 -----
 - activates dockerproject new repository by default.

diff --git a/cookbooks/docker-grid/recipes/engine.rb b/cookbooks/docker-grid/recipes/engine.rb
index 0a367a3..7cdecf7 100644 (file)
--- a/cookbooks/docker-grid/recipes/engine.rb
+++ b/cookbooks/docker-grid/recipes/engine.rb
@@ -177,15 +177,15 @@ when 'rhel'
       end
     }
 
+    # each repo of the new 'docker-ce-stable' and the old 'dockerrepo' is disabled by default to prevent automatic update.
+    enablerepos = enable_new_repo ? ['docker-ce-stable'] : ['dockerrepo']
+    enablerepos.push(ex_enablerepo) if enable_new_repo && !ex_enablerepo.nil? && !ex_enablerepo.empty?
     pkgs.each {|pkg|
       resources(yum_package: pkg) rescue yum_package pkg do
         allow_downgrade true
         action :install
         version docker_ver unless docker_ver.empty?
-        # for the new repository
-        options "--enablerepo=#{ex_enablerepo}" if enable_new_repo && !ex_enablerepo.nil? && !ex_enablerepo.empty?
-        # old dockerrepo is disabled by default to prevent automatic update.
-        options '--enablerepo=dockerrepo' unless enable_new_repo
+        options "--enablerepo=#{enablerepos.join(',')}"
         notifies :run, 'bash[clean_up_docker0_bridge]', :before if pkg == 'docker-engine' || pkg == 'docker-ce'
       end
     }

diff --git a/cookbooks/docker-grid/templates/default/etc/yum.repos.d/docker-ce.repo b/cookbooks/docker-grid/templates/default/etc/yum.repos.d/docker-ce.repo
index efe3e1a..5154d2e 100644 (file)
--- a/cookbooks/docker-grid/templates/default/etc/yum.repos.d/docker-ce.repo
+++ b/cookbooks/docker-grid/templates/default/etc/yum.repos.d/docker-ce.repo
@@ -1,62 +1,62 @@
-[docker-ce-stable]\r
-name=Docker CE Stable - $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/$basearch/stable\r
-enabled=1\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-stable-debuginfo]\r
-name=Docker CE Stable - Debuginfo $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/stable\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-stable-source]\r
-name=Docker CE Stable - Sources\r
-baseurl=https://download.docker.com/linux/centos/7/source/stable\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-edge]\r
-name=Docker CE Edge - $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/$basearch/edge\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-edge-debuginfo]\r
-name=Docker CE Edge - Debuginfo $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/edge\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-edge-source]\r
-name=Docker CE Edge - Sources\r
-baseurl=https://download.docker.com/linux/centos/7/source/edge\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-test]\r
-name=Docker CE Test - $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/$basearch/test\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-test-debuginfo]\r
-name=Docker CE Test - Debuginfo $basearch\r
-baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/test\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
-\r
-[docker-ce-test-source]\r
-name=Docker CE Test - Sources\r
-baseurl=https://download.docker.com/linux/centos/7/source/test\r
-enabled=0\r
-gpgcheck=1\r
-gpgkey=https://download.docker.com/linux/centos/gpg\r
+[docker-ce-stable]
+name=Docker CE Stable - $basearch
+baseurl=https://download.docker.com/linux/centos/7/$basearch/stable
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-stable-debuginfo]
+name=Docker CE Stable - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/stable
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-stable-source]
+name=Docker CE Stable - Sources
+baseurl=https://download.docker.com/linux/centos/7/source/stable
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-edge]
+name=Docker CE Edge - $basearch
+baseurl=https://download.docker.com/linux/centos/7/$basearch/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-edge-debuginfo]
+name=Docker CE Edge - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-edge-source]
+name=Docker CE Edge - Sources
+baseurl=https://download.docker.com/linux/centos/7/source/edge
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-test]
+name=Docker CE Test - $basearch
+baseurl=https://download.docker.com/linux/centos/7/$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-test-debuginfo]
+name=Docker CE Test - Debuginfo $basearch
+baseurl=https://download.docker.com/linux/centos/7/debug-$basearch/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg
+
+[docker-ce-test-source]
+name=Docker CE Test - Sources
+baseurl=https://download.docker.com/linux/centos/7/source/test
+enabled=0
+gpgcheck=1
+gpgkey=https://download.docker.com/linux/centos/gpg