From: whitestar <whitestar@users.osdn.me>
Date: Wed, 22 Aug 2018 09:44:56 +0000 (+0900)
Subject: refactoring.
X-Git-Tag: docker-grid-1.2.1~5
X-Git-Url: http://git.osdn.net/view?p=metasearch%2Fgrid-chef-repo.git;a=commitdiff_plain;h=cf34c4a18d871e30c375499780dca7eae09c8f54

refactoring.
---

diff --git a/cookbooks/docker-grid/recipes/compose.rb b/cookbooks/docker-grid/recipes/compose.rb
index 06b5334..059e105 100644
--- a/cookbooks/docker-grid/recipes/compose.rb
+++ b/cookbooks/docker-grid/recipes/compose.rb
@@ -75,11 +75,14 @@ end
 
 case install_flavor
 when 'dockerproject'
-  expected_ver = node['docker-grid']['compose']['release_url'].match(/(\d+\.\d+.\d+)/)[1]
+  # latest version
+  # %x(curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r .tag_name).chomp
+  release_url = node['docker-grid']['compose']['release_url']
+  expected_ver = release_url.match(/(\d+\.\d+.\d+)/)[1]
 
   execute 'install_docker_compose' do
     user 'root'
-    command "curl -L \"#{node['docker-grid']['compose']['release_url']}\" -o #{docker_compose_path} && chmod +x #{docker_compose_path}"
+    command "curl -L \"#{release_url}\" -o #{docker_compose_path} && chmod +x #{docker_compose_path}"
     action :run
     not_if "#{docker_compose_path} -v | grep #{expected_ver},"
     not_if { ::File.exist?(docker_compose_path) } unless auto_upgrade