From: whitestar <whitestar@users.osdn.me>
Date: Sun, 19 Aug 2018 02:08:18 +0000 (+0900)
Subject: refactoring.
X-Git-Tag: docker-grid-1.1.0~2
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=1cbea9fb2f2810e705f95e80f57a8eaf997e148f;p=metasearch%2Fgrid-chef-repo.git

refactoring.
---

diff --git a/roles/docker-new-repo.rb b/roles/docker-new-repo.rb
index 046974e..cf9f217 100644
--- a/roles/docker-new-repo.rb
+++ b/roles/docker-new-repo.rb
@@ -45,7 +45,7 @@ override_attributes(
       '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' 
+      #'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',
diff --git a/roles/screwdriver-all-on-docker-override.rb b/roles/screwdriver-all-on-docker-override.rb
index 9d1144e..98f2f0e 100644
--- a/roles/screwdriver-all-on-docker-override.rb
+++ b/roles/screwdriver-all-on-docker-override.rb
@@ -31,8 +31,10 @@ override_attributes(
     'engine' => {
       #'skip_setup' => true,  # default: false
       #'version' => '',  # '' (=latest) or exact version
-      #'version_on_centos' => '18.06.0.ce-3',  # '18.03.1.ce-1', '17.12.1.ce-1',
-      #'version_on_ubuntu' => '18.06.0~ce~3-0',  # '18.03.1~ce-0', '17.12.1~ce-0'
+      #'version_on_centos' => '17.12.1.ce-1',  # '18.06.0.ce-3', '18.03.1.ce-1'
+      #'version_on_ubuntu' => '17.12.1~ce-0',  # '18.06.0~ce~3-0', '18.03.1~ce-0' 
+      #'storage-driver_on_centos' => 'overlay',   # defacto: 'devicemapper'
+      #'storage-driver_on_ubuntu' => 'overlay2',  # defacto: 'aufs'
       'daemon_extra_options' => [
         '-H fd://',
         '--bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
@@ -40,6 +42,7 @@ override_attributes(
     },
     'compose' => {
       #'skip_setup' => true,  # default: false
+      'release_base_url' => 'https://github.com/docker/compose/releases/download/1.21.2',
     },
   },
   'screwdriver' => {
diff --git a/roles/screwdriver-on-docker-override.rb b/roles/screwdriver-on-docker-override.rb
index 7cc2d3b..a30bdb5 100644
--- a/roles/screwdriver-on-docker-override.rb
+++ b/roles/screwdriver-on-docker-override.rb
@@ -31,8 +31,10 @@ override_attributes(
     'engine' => {
       #'skip_setup' => true,  # default: false
       #'version' => '',  # '' (=latest) or exact version
-      #'version_on_centos' => '18.06.0.ce-3',  # '18.03.1.ce-1', '17.12.1.ce-1',
-      #'version_on_ubuntu' => '18.06.0~ce~3-0',  # '18.03.1~ce-0', '17.12.1~ce-0'
+      #'version_on_centos' => '17.12.1.ce-1',  # '18.06.0.ce-3', '18.03.1.ce-1'
+      #'version_on_ubuntu' => '17.12.1~ce-0',  # '18.06.0~ce~3-0', '18.03.1~ce-0' 
+      #'storage-driver_on_centos' => 'overlay',   # defacto: 'devicemapper'
+      #'storage-driver_on_ubuntu' => 'overlay2',  # defacto: 'aufs'
       'daemon_extra_options' => [
         '-H fd://',
         '--bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
@@ -40,6 +42,7 @@ override_attributes(
     },
     'compose' => {
       #'skip_setup' => true,  # default: false
+      'release_base_url' => 'https://github.com/docker/compose/releases/download/1.21.2',
     },
   },
   'screwdriver' => {