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

diff --git a/cookbooks/concourse-ci/CHANGELOG.md b/cookbooks/concourse-ci/CHANGELOG.md
index df99e0b..06cca1b 100644 (file)
--- a/cookbooks/concourse-ci/CHANGELOG.md
+++ b/cookbooks/concourse-ci/CHANGELOG.md
@@ -1,6 +1,10 @@
 concourse-ci CHANGELOG
 ======================
 
 concourse-ci CHANGELOG
 ======================
 

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

 0.2.5
 -----
 - adds the docker-compose v2 format support.
 0.2.5
 -----
 - adds the docker-compose v2 format support.

diff --git a/cookbooks/concourse-ci/README.md b/cookbooks/concourse-ci/README.md
index 665d66d..87a3f66 100644 (file)
--- a/cookbooks/concourse-ci/README.md
+++ b/cookbooks/concourse-ci/README.md
@@ -98,8 +98,8 @@ port = '18080'
 override_attributes(
   'concourse-ci' => {
     'docker-compose' => {
 override_attributes(
   'concourse-ci' => {
     'docker-compose' => {

+      # Version 1 docker-compose format (default)

       'config' => {
       'config' => {

-        # Version 1 docker-compose format

         'concourse-web' => {
           'image' => image,
           'ports' => [
         'concourse-web' => {
           'image' => image,
           'ports' => [


@@ -122,6 +122,35 @@ override_attributes(
           #],
         },
       },
           #],
         },
       },

+=begin
+      # Version 2 docker-compose format
+      'config_format_version' => '2',
+      'config' => {
+        'services' => {
+          'concourse-web' => {
+            'image' => image,
+            'ports' => [
+              "#{port}:8080",
+            ],
+            #'volumes' => [
+            #  # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
+            #  #"#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys",
+            #],
+            'environment' => {
+              'CONCOURSE_EXTERNAL_URL' => "http://192.168.1.3:#{port}",
+              #'CONCOURSE_RESOURCE_CHECKING_INTERVAL' => '1m',  # default
+            },
+          },
+          'concourse-worker' => {
+            'image' => image,
+            #'volumes' => [
+            #  # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
+            #  #"#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys",
+            #],
+          },
+        },
+      },
+=end

     },
   },
 )
     },
   },
 )

diff --git a/cookbooks/concourse-ci/attributes/default.rb b/cookbooks/concourse-ci/attributes/default.rb
index bd6a822..8bc09f1 100644 (file)
--- a/cookbooks/concourse-ci/attributes/default.rb
+++ b/cookbooks/concourse-ci/attributes/default.rb
@@ -2,7 +2,7 @@
 # Cookbook Name:: concourse-ci
 # Attributes:: default
 #
 # Cookbook Name:: concourse-ci
 # Attributes:: default
 #

-# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -181,5 +181,9 @@ version_2_config = {
   'services' => new_config,
 }
 
   'services' => new_config,
 }
 

-default['concourse-ci']['docker-compose']['config'] = \
-  node['concourse-ci']['docker-compose']['config_format_version'] == '1' ? version_1_config : version_2_config
+case node['concourse-ci']['docker-compose']['config_format_version'].to_i
+when 1
+  default['concourse-ci']['docker-compose']['config'] = version_1_config
+when 2
+  default['concourse-ci']['docker-compose']['config'] = version_2_config
+end

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
 #
 # 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.
 #
 # 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)
 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']
 
 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']
 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']
   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\""
     = "/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
     node.rm('concourse-ci', 'docker-compose', 'config', 'services', 'concourse-web', 'command')
     node.rm('concourse-ci', 'docker-compose', 'config', 'services', 'concourse-worker', 'command')
   else

diff --git a/cookbooks/concourse-ci/version b/cookbooks/concourse-ci/version
index 3a4036f..53a75d6 100644 (file)
--- a/cookbooks/concourse-ci/version
+++ b/cookbooks/concourse-ci/version
@@ -1 +1 @@
-0.2.5
+0.2.6