fixes format version detection of a local `docker-compose.yml`.

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

diff --git a/cookbooks/concourse-ci/recipes/docker-compose.rb b/cookbooks/concourse-ci/recipes/docker-compose.rb
index f36a401..a4960cf 100644 (file)
--- a/cookbooks/concourse-ci/recipes/docker-compose.rb
+++ b/cookbooks/concourse-ci/recipes/docker-compose.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: concourse-ci
 # Recipe:: docker-compose
 #
-# Copyright 2017, whitestar
+# Copyright 2017-2018, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -87,16 +87,16 @@ config_srvs_local = nil
 if File.exist?(config_file)
   require 'yaml'
   config_srvs_local = YAML.load_file(config_file)
-  config_srvs_local = config_srvs_local['services'] if config_srvs_local.key?('version') && config_srvs_local['version'] == '2'
+  config_srvs_local = config_srvs_local['services'] if config_srvs_local.key?('version') && config_srvs_local['version'].to_i >= 2
 end
 
 config_format_version = node['concourse-ci']['docker-compose']['config_format_version']
 
-# if config_format_version == '1'
+# if config_format_version.to_i == 1
 config_srvs = node['concourse-ci']['docker-compose']['config']
 override_config_srvs = node.override['concourse-ci']['docker-compose']['config']
 force_override_config_srvs = node.force_override['concourse-ci']['docker-compose']['config']
-if config_format_version == '2'
+if config_format_version.to_i == 2
   config_srvs = config_srvs['services']
   override_config_srvs = override_config_srvs['services']
   force_override_config_srvs = force_override_config_srvs['services']
@@ -263,7 +263,7 @@ if node['concourse-ci']['docker-compose']['import_ca']
     = "/bin/sh -c \"#{import_ca_script} && #{image_entrypoint} web\""
   override_config_srvs['concourse-worker']['entrypoint'] \
     = "/bin/sh -c \"#{import_ca_script} && #{image_entrypoint} worker\""
-  if config_format_version == '2'
+  if config_format_version.to_i == 2
     node.rm('concourse-ci', 'docker-compose', 'config', 'services', 'concourse-web', 'command')
     node.rm('concourse-ci', 'docker-compose', 'config', 'services', 'concourse-worker', 'command')
   else