- adds the `['docker-grid']['dockerproject']['apt_new_repo_sections']` attribute.

- adds the `['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']` attribute.

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index 95531fb..c18c19e 100644 (file)
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,10 @@
 # docker-grid CHANGELOG
 
+0.5.6
+-----
+- adds the `['docker-grid']['dockerproject']['apt_new_repo_sections']` attribute.
+- adds the `['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']` attribute.
+
 0.5.5
 -----
 - adds the `docker-grid::dind-compose` recipe.

diff --git a/cookbooks/docker-grid/README.md b/cookbooks/docker-grid/README.md
index 8023d2a..d4e3dfe 100644 (file)
--- a/cookbooks/docker-grid/README.md
+++ b/cookbooks/docker-grid/README.md
@@ -38,6 +38,8 @@ This cookbook sets up Docker engine etc.
 |:--|:--|:--|:--|
 |`['docker-grid']['install_flavor']`|String|`'dockerproject'` or `'os-repository'`|`'dockerproject'`|
 |`['docker-grid']['dockerproject']['enable_new_repo']`|Boolean|flag to use the new repository.|`false`|
+|`['docker-grid']['dockerproject']['apt_new_repo_sections']`|String|APT line's section. e.g. `'stable edge'`, `'edge test'`,...|`'stable'`|
+|`['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']`|String|e.g. `'docker-ce-edge,docker-ce-test'`|`''`|
 |`['docker-grid']['dockerproject']['package_name']`|String|If the `'enable_new_repo'` is `true`, `'docker-ce'` will be automatically set.|`'docker-engine'`|
 |`['docker-grid']['apt_repo']['url']`|String|If the `'enable_new_repo'` is `true`, the new repository URL will be automatically set.|`'https://apt.dockerproject.org/repo'`|
 |`['docker-grid']['apt_repo']['keyserver']`|String|for the old repository only.|`'hkp://p80.pool.sks-keyservers.net:80'`|

diff --git a/cookbooks/docker-grid/attributes/default.rb b/cookbooks/docker-grid/attributes/default.rb
index a55e0bb..f7f0f9e 100644 (file)
--- a/cookbooks/docker-grid/attributes/default.rb
+++ b/cookbooks/docker-grid/attributes/default.rb
@@ -24,6 +24,8 @@ default['docker-grid']['dockerproject']['enable_new_repo'] = false
 # read only
 force_override['docker-grid']['dockerproject']['apt_new_repo_url'] = "https://download.docker.com/linux/#{platform}"
 force_override['docker-grid']['dockerproject']['apt_old_repo_url'] = 'https://apt.dockerproject.org/repo'
+# e.g. 'stable edge', 'edge test',...
+default['docker-grid']['dockerproject']['apt_new_repo_sections'] = 'stable'
 default['docker-grid']['dockerproject']['package_name'] \
   = node['docker-grid']['dockerproject']['enable_new_repo'] ? 'docker-ce' : 'docker-engine'
 apt_repo_url = \
@@ -39,6 +41,8 @@ default['docker-grid']['apt_repo'] = {
   'keyserver' => 'hkp://p80.pool.sks-keyservers.net:80',
   'recv-keys' => '58118E89F3A912897C070ADBF76221572C52609D',
 }
+# e.g. 'docker-ce-edge,docker-ce-test'
+default['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo'] = ''
 # Old yum repository
 default['docker-grid']['yum_repo'] = {
   'baseurl' => 'https://yum.dockerproject.org/repo/main/centos/$releasever/',

diff --git a/cookbooks/docker-grid/recipes/engine.rb b/cookbooks/docker-grid/recipes/engine.rb
index 9fe312c..d7f9654 100644 (file)
--- a/cookbooks/docker-grid/recipes/engine.rb
+++ b/cookbooks/docker-grid/recipes/engine.rb
@@ -116,6 +116,8 @@ end
 
 case platform_family
 when 'rhel'
+  ex_enablerepo = node['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']
+
   if storage_driver == 'devicemapper'
     [
       #'yum-utils',
@@ -179,7 +181,9 @@ when 'rhel'
         allow_downgrade true
         action :install
         version docker_ver unless docker_ver.empty?
-        # dockerrepo is disabled by default to prevent automatic update.
+        # 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
         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/apt/sources.list.d/docker.list b/cookbooks/docker-grid/templates/default/etc/apt/sources.list.d/docker.list
index 8d8a590..5611a98 100644 (file)
--- a/cookbooks/docker-grid/templates/default/etc/apt/sources.list.d/docker.list
+++ b/cookbooks/docker-grid/templates/default/etc/apt/sources.list.d/docker.list
@@ -16,7 +16,7 @@ if !override_apt_line.nil? && !override_apt_line.empty?
 else
   if enable_new_repo
 -%>
-deb [arch=<%= arch %>] <%= node['docker-grid']['apt_repo']['url'] %> <%= node['lsb']['codename'] %> stable
+deb [arch=<%= arch %>] <%= node['docker-grid']['apt_repo']['url'] %> <%= node['lsb']['codename'] %> <%= node['docker-grid']['dockerproject']['apt_new_repo_sections'] %>
 <%
   else
 -%>

diff --git a/cookbooks/docker-grid/version b/cookbooks/docker-grid/version
index d1d899f..b49b253 100644 (file)
--- a/cookbooks/docker-grid/version
+++ b/cookbooks/docker-grid/version
@@ -1 +1 @@
-0.5.5
+0.5.6