update docker roles.

diff --git a/roles/docker-new-repo.rb b/roles/docker-new-repo.rb
index d5e3eb6..aa45dcd 100644 (file)
--- a/roles/docker-new-repo.rb
+++ b/roles/docker-new-repo.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2017, whitestar
+# Copyright 2016-2019, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ override_attributes(
     'compose' => {
       #'skip_setup' => true,  # default: false
       'auto_upgrade' => true,  # default: false
-      'version' => '1.21.2',
+      'version' => '1.24.0',
     },
     'engine' => {
       #'skip_setup' => true,  # default: false
@@ -46,12 +46,12 @@ override_attributes(
       #'version_on_centos' => '18.06.0.ce-3',  # '18.03.1.ce-1', '17.12.1.ce-1',
       'version_on_ubuntu' => '',  # latest
       #'version_on_ubuntu' => '18.06.0~ce~3-0',  # '18.03.1~ce-0', '17.12.1~ce-0'
-      'storage-driver_on_centos' => 'overlay',  # defacto: 'devicemapper'
+      'storage-driver_on_centos' => 'overlay2',  # defacto: 'devicemapper'
       'storage-driver_on_ubuntu' => 'overlay2',  # defacto: 'aufs'
       #'userns-remap' => 'default',
       'daemon_extra_options' => [
         '-H fd://',
-        #'-H fd:// --bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
+        #'--bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
         # for docker >= 1.10, docker-engine >= 1.12 (on rhel family)
         # '-H fd://' option automatically removed by this cookbook.
         # See https://github.com/docker/docker/issues/22847

diff --git a/roles/docker.rb b/roles/docker.rb
index 2769d39..a662cc1 100644 (file)
--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2018, whitestar
+# Copyright 2016-2019, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@ name 'docker'
 description 'Docker Engine'
 
 # if you set `nil` to its attribute, you can deactivate its override.
-docker_ver_on_centos = '17.12.1.ce-1'
-docker_ver_on_ubuntu = '17.12.1~ce-0'
-docker_compose_ver = '1.21.2'
+docker_ver_on_centos = nil
+#docker_ver_on_centos = '17.12.1.ce-1'
+docker_ver_on_ubuntu = nil
+#docker_ver_on_ubuntu = '17.12.1~ce-0'
+docker_compose_ver = '1.24.0'
 
 docker_bip        = '192.168.100.1/24'
 docker_fixed_cidr = '192.168.100.0/24'
@@ -40,7 +42,7 @@ override_attributes(
       #'version' => '',  # '' (=latest) or exact version
       'version_on_centos' => docker_ver_on_centos,  # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
       'version_on_ubuntu' => docker_ver_on_ubuntu,  # '18.06.0~ce~3-0', '18.03.1~ce-0', '17.12.1~ce-0' 
-      #'storage-driver_on_centos' => 'overlay',   # defacto: 'devicemapper'
+      #'storage-driver_on_centos' => 'overlay2',  # defacto: 'devicemapper'
       #'storage-driver_on_ubuntu' => 'overlay2',  # defacto: 'aufs'
       'daemon_extra_options' => [
         '-H fd://',