adds the Docker project new repository support.

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

diff --git a/roles/docker.rb b/roles/docker.rb
index 7c6cdf4..5cfec58 100644 (file)
--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -15,7 +15,7 @@
 #
 
 name 'docker'
-description 'Docker Engine'
+description 'Docker Engine by the old repository'
 
 run_list(
   'recipe[docker-grid::engine]',
@@ -30,28 +30,26 @@ default_attributes(
 override_attributes(
   'docker-grid' => {
     'install_flavor' => 'dockerproject',
-    #'install_flavor' => 'os-repository',
+    'dockerproject' => {
+      'enable_new_repo' => false,
+    },
     'compose' => {
-      'skip_setup' => true,  # default: false
+      #'skip_setup' => true,  # default: false
     },
     'engine' => {
       'version' => '',  # latest
       #'skip_setup' => true,  # default: false
-      #'version_on_centos' => '17.03.1.ce-1',  # docker-engine
-      #'version_on_centos' => '1.13.1-1',      # docker-engine
-      #'version_on_centos' => '1.12.6-1',      # docker-engine
-      #'version_on_centos' => '1.12.6-11',     # docker
-      #'version_on_centos' => '1.12.5-14',     # docker
-      #'version_on_centos' => '1.11.2-1',      # docker-engine
-      #'version_on_centos' => '1.10.3-1',      # docker-engine
-      #'version_on_centos' => '1.10.3-59',     # docker      
-      #'version_on_ubuntu' => '17.05.0~ce-0',  # docker-engine
-      #'version_on_ubuntu' => '17.03.1~ce-0',  # docker-engine
-      #'version_on_ubuntu' => '1.13.1-0',      # docker-engine
-      #'version_on_ubuntu' => '1.12.6-0',      # docker-engine
-      #'version_on_ubuntu' => '1.12.3-0ubuntu4~16.04.2',  # docker.io
-      #'version_on_ubuntu' => '1.11.2-0',      # docker-engine
-      #'version_on_ubuntu' => '1.10.3-0ubuntu6',          # docker.io
+      # old package: `docker-engine`
+      #'version_on_centos' => '17.03.1.ce-1',
+      #'version_on_centos' => '1.13.1-1',
+      #'version_on_centos' => '1.12.6-1',
+      #'version_on_centos' => '1.11.2-1',
+      #'version_on_centos' => '1.10.3-1',
+      #'version_on_ubuntu' => '17.05.0~ce-0',
+      #'version_on_ubuntu' => '17.03.1~ce-0',
+      #'version_on_ubuntu' => '1.13.1-0',
+      #'version_on_ubuntu' => '1.12.6-0',
+      #'version_on_ubuntu' => '1.11.2-0',
       'storage-driver_on_centos' => 'overlay',
       'storage-driver_on_ubuntu' => 'overlay',  # default: aufs
       #'userns-remap' => 'default',