docker-new-repo role installs the latest docker.

[metasearch/grid-chef-repo.git] / roles / docker-new-repo.rb

diff --git a/roles/docker-new-repo.rb b/roles/docker-new-repo.rb
index b1b5078..2a4563f 100644 (file)
--- a/roles/docker-new-repo.rb
+++ b/roles/docker-new-repo.rb
@@ -18,7 +18,8 @@ name 'docker-new-repo'
 description 'Docker CE by the new repository'
 
 run_list(
-  'role[docker]',
+  'recipe[docker-grid::engine]',
+  'recipe[docker-grid::compose]',
 )
 
 #env_run_lists
@@ -38,21 +39,23 @@ override_attributes(
       'release_base_url' => 'https://github.com/docker/compose/releases/download/1.17.1',
     },
     'engine' => {
-      'version' => '',  # latest
       #'skip_setup' => true,  # default: false
       # new package: `docker-ce`
-      #'version_on_centos' => '17.09.0.ce-1',
-      #'version_on_ubuntu' => '17.05.0~ce-0',
-      'storage-driver_on_centos' => 'devicemapper',
-      'storage-driver_on_ubuntu' => 'overlay2',  # default: aufs
+      #'version' => '',  # '' (=latest) or exact version
+      'version_on_centos' => '',  # latest
+      #'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_ubuntu' => 'overlay2',  # defacto: 'aufs'
       #'userns-remap' => 'default',
-      #'daemon_extra_options' => [
-        #'-H fd://',
+      'daemon_extra_options' => [
+        '-H fd://',
         #'-H fd:// --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
-      #].join(' '), 
+      ].join(' '), 
     },
   },
 )