override_attributes(
'concourse-ci' => {
'docker-compose' => {
+ # Version 1 docker-compose format (default)
'config' => {
- # Version 1 docker-compose format
'concourse-web' => {
'image' => image,
'ports' => [
#],
},
},
+=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
},
},
)
# 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.
'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
# 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.
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']
= "/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