refactoring.

[metasearch/grid-chef-repo.git] / cookbooks / docker-grid / recipes / compose.rb

diff --git a/cookbooks/docker-grid/recipes/compose.rb b/cookbooks/docker-grid/recipes/compose.rb
index b4c8ab1..059e105 100644 (file)
--- a/cookbooks/docker-grid/recipes/compose.rb
+++ b/cookbooks/docker-grid/recipes/compose.rb
@@ -20,6 +20,7 @@
 # See: https://docs.docker.com/compose/install/
 
 install_flavor = node['docker-grid']['compose']['install_flavor']
+auto_upgrade = node['docker-grid']['compose']['auto_upgrade']
 
 if node['docker-grid']['compose']['skip_setup']
   log 'Skip the Docker Compose setup.'
@@ -74,14 +75,17 @@ end
 
 case install_flavor
 when 'dockerproject'
-  excepted_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 #{excepted_ver},"
-    not_if { ::File.exist?(docker_compose_path) } unless node['docker-grid']['compose']['auto_upgrade']
+    not_if "#{docker_compose_path} -v | grep #{expected_ver},"
+    not_if { ::File.exist?(docker_compose_path) } unless auto_upgrade
   end
 
   # for sudo secure_path on RHEL family OS
@@ -90,17 +94,24 @@ when 'dockerproject'
     only_if { node['platform_family'] == 'rhel' }
   end
 when 'os-repository'
+  act = auto_upgrade ? :upgrade : :install
   package 'docker-compose' do
-    action :install
+    action act
   end
 when 'pypi'
+  expected_ver = node['docker-grid']['compose']['version']
+  expected_ver = '' if expected_ver.nil?
+  pin_ver = expected_ver.empty? ? '' : "==#{expected_ver}"
+
   include_recipe 'platform_utils::pip'
 
+  # Note: installed to /usr/local/bin/docker-compose
   execute 'pip_install_docker_compose' do
     user 'root'
-    environment 'HOME' => '/root'
-    command 'pip install docker-compose'
+    environment 'HOME' => '/root'  # = sudo -H
+    command "pip install docker-compose#{pin_ver}"
     action :run
-    not_if 'which docker-compose'
+    not_if "pip list | grep docker-compose | grep '(#{expected_ver})'" unless expected_ver.empty?
+    not_if "pip list | grep docker-compose" unless auto_upgrade
   end
 end