| リビジョン | 4e71dcad9d00e53025f0cb98dc937419a82da97f (tree) |
|---|---|
| 日時 | 2017-11-26 14:47:45 |
| 作者 | whitestar <whitestar@user...> |
| コミッター | whitestar |
- adds the ['docker-grid']['dockerproject']['apt_new_repo_sections'] attribute.
- adds the ['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo'] attribute.
cookbooks/docker-grid/CHANGELOG.md (diff) cookbooks/docker-grid/README.md (diff) cookbooks/docker-grid/attributes/default.rb (diff) cookbooks/docker-grid/recipes/engine.rb (diff) cookbooks/docker-grid/templates/default/etc/apt/sources.list.d/docker.list (diff) cookbooks/docker-grid/version (diff)| @@ -1,5 +1,10 @@ | ||
| 1 | 1 | # docker-grid CHANGELOG |
| 2 | 2 | |
| 3 | +0.5.6 | |
| 4 | +----- | |
| 5 | +- adds the `['docker-grid']['dockerproject']['apt_new_repo_sections']` attribute. | |
| 6 | +- adds the `['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']` attribute. | |
| 7 | + | |
| 3 | 8 | 0.5.5 |
| 4 | 9 | ----- |
| 5 | 10 | - adds the `docker-grid::dind-compose` recipe. |
| @@ -38,6 +38,8 @@ This cookbook sets up Docker engine etc. | ||
| 38 | 38 | |:--|:--|:--|:--| |
| 39 | 39 | |`['docker-grid']['install_flavor']`|String|`'dockerproject'` or `'os-repository'`|`'dockerproject'`| |
| 40 | 40 | |`['docker-grid']['dockerproject']['enable_new_repo']`|Boolean|flag to use the new repository.|`false`| |
| 41 | +|`['docker-grid']['dockerproject']['apt_new_repo_sections']`|String|APT line's section. e.g. `'stable edge'`, `'edge test'`,...|`'stable'`| | |
| 42 | +|`['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo']`|String|e.g. `'docker-ce-edge,docker-ce-test'`|`''`| | |
| 41 | 43 | |`['docker-grid']['dockerproject']['package_name']`|String|If the `'enable_new_repo'` is `true`, `'docker-ce'` will be automatically set.|`'docker-engine'`| |
| 42 | 44 | |`['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'`| |
| 43 | 45 | |`['docker-grid']['apt_repo']['keyserver']`|String|for the old repository only.|`'hkp://p80.pool.sks-keyservers.net:80'`| |
| @@ -24,6 +24,8 @@ default['docker-grid']['dockerproject']['enable_new_repo'] = false | ||
| 24 | 24 | # read only |
| 25 | 25 | force_override['docker-grid']['dockerproject']['apt_new_repo_url'] = "https://download.docker.com/linux/#{platform}" |
| 26 | 26 | force_override['docker-grid']['dockerproject']['apt_old_repo_url'] = 'https://apt.dockerproject.org/repo' |
| 27 | +# e.g. 'stable edge', 'edge test',... | |
| 28 | +default['docker-grid']['dockerproject']['apt_new_repo_sections'] = 'stable' | |
| 27 | 29 | default['docker-grid']['dockerproject']['package_name'] \ |
| 28 | 30 | = node['docker-grid']['dockerproject']['enable_new_repo'] ? 'docker-ce' : 'docker-engine' |
| 29 | 31 | apt_repo_url = \ |
| @@ -39,6 +41,8 @@ default['docker-grid']['apt_repo'] = { | ||
| 39 | 41 | 'keyserver' => 'hkp://p80.pool.sks-keyservers.net:80', |
| 40 | 42 | 'recv-keys' => '58118E89F3A912897C070ADBF76221572C52609D', |
| 41 | 43 | } |
| 44 | +# e.g. 'docker-ce-edge,docker-ce-test' | |
| 45 | +default['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo'] = '' | |
| 42 | 46 | # Old yum repository |
| 43 | 47 | default['docker-grid']['yum_repo'] = { |
| 44 | 48 | 'baseurl' => 'https://yum.dockerproject.org/repo/main/centos/$releasever/', |
| @@ -116,6 +116,8 @@ end | ||
| 116 | 116 | |
| 117 | 117 | case platform_family |
| 118 | 118 | when 'rhel' |
| 119 | + ex_enablerepo = node['docker-grid']['dockerproject']['yum_new_repo_extra_enablerepo'] | |
| 120 | + | |
| 119 | 121 | if storage_driver == 'devicemapper' |
| 120 | 122 | [ |
| 121 | 123 | #'yum-utils', |
| @@ -179,7 +181,9 @@ when 'rhel' | ||
| 179 | 181 | allow_downgrade true |
| 180 | 182 | action :install |
| 181 | 183 | version docker_ver unless docker_ver.empty? |
| 182 | - # dockerrepo is disabled by default to prevent automatic update. | |
| 184 | + # for the new repository | |
| 185 | + options "--enablerepo=#{ex_enablerepo}" if enable_new_repo && !ex_enablerepo.nil? && !ex_enablerepo.empty? | |
| 186 | + # old dockerrepo is disabled by default to prevent automatic update. | |
| 183 | 187 | options '--enablerepo=dockerrepo' unless enable_new_repo |
| 184 | 188 | notifies :run, 'bash[clean_up_docker0_bridge]', :before if pkg == 'docker-engine' || pkg == 'docker-ce' |
| 185 | 189 | end |
| @@ -16,7 +16,7 @@ if !override_apt_line.nil? && !override_apt_line.empty? | ||
| 16 | 16 | else |
| 17 | 17 | if enable_new_repo |
| 18 | 18 | -%> |
| 19 | -deb [arch=<%= arch %>] <%= node['docker-grid']['apt_repo']['url'] %> <%= node['lsb']['codename'] %> stable | |
| 19 | +deb [arch=<%= arch %>] <%= node['docker-grid']['apt_repo']['url'] %> <%= node['lsb']['codename'] %> <%= node['docker-grid']['dockerproject']['apt_new_repo_sections'] %> | |
| 20 | 20 | <% |
| 21 | 21 | else |
| 22 | 22 | -%> |
| @@ -1 +1 @@ | ||
| 1 | -0.5.5 | |
| 1 | +0.5.6 |
Fork