activates docker new repository by default and updates docker installed default version.

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index 1c8a977..ff0d349 100644 (file)
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,10 @@
 # docker-grid CHANGELOG
 
+1.0.0
+-----
+- activates dockerproject new repository by default.
+- updates docker default version.
+
 0.5.9
 -----
 - fixes utility scripts.

diff --git a/cookbooks/docker-grid/README.md b/cookbooks/docker-grid/README.md
index d4e3dfe..1ba70fb 100644 (file)
--- a/cookbooks/docker-grid/README.md
+++ b/cookbooks/docker-grid/README.md
@@ -37,7 +37,7 @@ This cookbook sets up Docker engine etc.
 |Key|Type|Description, example|Default|
 |:--|:--|:--|:--|
 |`['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']['enable_new_repo']`|Boolean|flag to use the new repository.|`true`|
 |`['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'`|
@@ -59,9 +59,9 @@ This cookbook sets up Docker engine etc.
 |`['docker-grid']['dind-compose']['data_dir']`|String|persistent data directory.|`"#{node['docker-grid']['dind-compose']['app_dir']}/data"`|
 |`['docker-grid']['dind-compose']['config']`|Hash|`docker-compose.yml` configurations.|See `attributes/default.rb`|
 |`['docker-grid']['engine']['skip_setup']`|Boolean||`false`|
-|`['docker-grid']['engine']['version_on_centos']`|String|Docker version for CentOS. `''` (empty) means the latest version.|`'1.11.2-1'`|
-|`['docker-grid']['engine']['version_on_debian']`|String|Docker version for Debian. `''` (empty) means the latest version.|`'17.03.1~ce-0'`|
-|`['docker-grid']['engine']['version_on_ubuntu']`|String|Docker version for Ubuntu. `''` (empty) means the latest version.|`'1.11.2-0'`|
+|`['docker-grid']['engine']['version_on_centos']`|String|Docker version for CentOS. `''` (empty) means the latest version.|`'17.12.1.ce-1'`|
+|`['docker-grid']['engine']['version_on_debian']`|String|Docker version for Debian. `''` (empty) means the latest version.|`'17.12.1~ce-0'`|
+|`['docker-grid']['engine']['version_on_ubuntu']`|String|Docker version for Ubuntu. `''` (empty) means the latest version.|`'17.12.1~ce-0'`|
 |`['docker-grid']['engine']['version']`|String|Docker version. `''` (empty) means the latest version. Note: this **default** value is overwritten by the `version_on_{centos or ubuntu}`.|See default.rb|
 |`['docker-grid']['engine']['storage-driver_on_centos']`|String|Docker storage driver (overlay, devicemapper, ...) for CentOS.|`'overlay'`|
 |`['docker-grid']['engine']['storage-driver_on_debian']`|String|Docker storage driver (aufs, overlay, ...) for Debian.|`'overlay2'`|

diff --git a/cookbooks/docker-grid/attributes/default.rb b/cookbooks/docker-grid/attributes/default.rb
index f7f0f9e..76ee24b 100644 (file)
--- a/cookbooks/docker-grid/attributes/default.rb
+++ b/cookbooks/docker-grid/attributes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: docker-grid
 # Attributes:: default
 #
-# Copyright 2016-2017, whitestar
+# Copyright 2016-2018, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 platform = node['platform']
 
 default['docker-grid']['install_flavor'] = 'dockerproject'  # or 'os-repository'
-default['docker-grid']['dockerproject']['enable_new_repo'] = false
+default['docker-grid']['dockerproject']['enable_new_repo'] = true
 # 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'
@@ -86,14 +86,15 @@ default['docker-grid']['dind-compose']['config'] = {
 }
 
 default['docker-grid']['engine']['skip_setup'] = false
-# dockerproject: 17.03.1.ce-1, 1.13.1-1, 1.12.6-1, 1.11.2-1, 1.10.3-1
+# dockerproject: 18.06.0.ce-3, 18.03.1.ce-1, 17.12.1.ce-1, 1.13.1-1
 # os-repository: yum list docker
 #   http://mirror.centos.org/centos/7.3.1611/extras/x86_64/Packages/
-default['docker-grid']['engine']['version_on_centos'] = '1.11.2-1'
-# dockerproject: 17.03.1~ce-0, 1.13.1-0, 1.12.6-0, 1.11.2-0
-default['docker-grid']['engine']['version_on_debian'] = '17.03.1~ce-0'
+default['docker-grid']['engine']['version_on_centos'] = '17.12.1.ce-1'
+# dockerproject: 18.06.0~ce~3-0, 18.03.1~ce-0, 17.12.1~ce-0, 1.13.1-0
+default['docker-grid']['engine']['version_on_debian'] = '17.12.1~ce-0'
+# dockerproject: 18.06.0~ce~3-0, 18.03.1~ce-0, 17.12.1~ce-0
 # os-repository: http://packages.ubuntu.com/search?keywords=docker.io&searchon=names
-default['docker-grid']['engine']['version_on_ubuntu'] = '1.11.2-0'
+default['docker-grid']['engine']['version_on_ubuntu'] = '17.12.1~ce-0'
 
 # '' (empty) or 'latest' version -> latest version
 case platform