OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

grid-chef-repo: Commit

Grid環境構築用のChefリポジトリです。


Commit MetaInfo

Révisione9d1dce43b16e2e4f7e095a36a7595d9eb5a9308 (tree)
l'heure2017-02-15 22:36:47
Auteurwhitestar <whitestar@gaea...>
Commiterwhitestar

Message de Log

Bug fix: SSH keys directory volume mount configurations.

Change Summary

Modification

--- a/cookbooks/concourse-ci/CHANGELOG.md
+++ b/cookbooks/concourse-ci/CHANGELOG.md
@@ -1,6 +1,10 @@
11 concourse-ci CHANGELOG
22 ======================
33
4+0.1.4
5+-----
6+- Bug fix: SSH keys directory volume mount configurations.
7+
48 0.1.3
59 -----
610 - moves secrets from the `docker-compose.yml` file to the `.env` file.
--- a/cookbooks/concourse-ci/README.md
+++ b/cookbooks/concourse-ci/README.md
@@ -72,7 +72,7 @@ run_list(
7272 'recipe[concourse-ci::docker-compose]',
7373 )
7474
75-image = 'concourse/concourse:2.6.0'
75+image = 'concourse/concourse:2.7.0'
7676 port = '18080'
7777
7878 override_attributes(
@@ -85,12 +85,20 @@ override_attributes(
8585 'ports' => [
8686 "#{port}:8080",
8787 ],
88+ #'volumes' => [
89+ # # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
90+ # #"#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys",
91+ #],
8892 'environment' => {
8993 'CONCOURSE_EXTERNAL_URL' => "http://192.168.1.3:#{port}",
9094 },
9195 },
9296 'concourse-worker' => {
9397 'image' => image,
98+ #'volumes' => [
99+ # # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
100+ # #"#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys",
101+ #],
94102 },
95103 },
96104 },
@@ -140,14 +148,19 @@ override_attributes(
140148 #'CONCOURSE_TLS_CERT' => '/root/server.crt',
141149 #'CONCOURSE_TLS_KEY' => '/root/server.key',
142150 },
143- 'volumes' => [
144- # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
145- #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
146- #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
147- ],
151+ #'volumes' => [
152+ # # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
153+ # #"#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys",
154+ # #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
155+ # #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
156+ #],
148157 },
149158 'concourse-worker' => {
150159 'image' => image,
160+ #'volumes' => [
161+ # # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
162+ # #"#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys",
163+ #],
151164 },
152165 },
153166 },
--- a/cookbooks/concourse-ci/attributes/default.rb
+++ b/cookbooks/concourse-ci/attributes/default.rb
@@ -83,7 +83,8 @@ version_1_config = {
8383 #'8443:8443', # https
8484 ],
8585 'volumes' => [
86- "#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys",
86+ # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
87+ #"#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys",
8788 ],
8889 'environment' => {
8990 #'CONCOURSE_TLS_BIND_PORT' => '8443', # activate HTTPS
@@ -106,7 +107,8 @@ version_1_config = {
106107 ],
107108 'command' => 'worker',
108109 'volumes' => [
109- "#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys",
110+ # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
111+ #"#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys",
110112 ],
111113 'environment' => {
112114 'CONCOURSE_TSA_HOST' => 'concourse-web',
--- a/cookbooks/concourse-ci/metadata.rb
+++ b/cookbooks/concourse-ci/metadata.rb
@@ -5,10 +5,17 @@ maintainer_email ''
55 license 'Apache 2.0'
66 description 'Installs/Configures Concourse CI by Docker Compose'
77 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8-version '0.1.3'
8+version '0.1.4'
99 source_url 'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
1010 issues_url 'https://osdn.jp/projects/metasearch/ticket'
1111
12+supports 'ubuntu', '>= 14.04'
13+=begin
14+%w( centos redhat ).each do |os|
15+ supports os, '>= 8.0'
16+end
17+=end
18+
1219 depends 'docker-grid', '>= 0.2.7'
1320 depends 'platform_utils', '>= 0.4.3'
1421 depends 'ssl_cert', '>= 0.3.7'
--- a/cookbooks/concourse-ci/recipes/docker-compose.rb
+++ b/cookbooks/concourse-ci/recipes/docker-compose.rb
@@ -150,6 +150,8 @@ web_vols = config_srvs['concourse-web']['volumes'].to_a
150150 web_ports = config_srvs['concourse-web']['ports']
151151 override_config_srvs['concourse-web']['ports'] = ['8080:8080'] if web_ports.empty?
152152
153+web_vols.push("#{node['concourse-ci']['docker-compose']['web_keys_dir']}:/concourse-keys")
154+
153155 web_password_reset = node['concourse-ci']['docker-compose']['web_password_reset']
154156 basic_auth_passwd = nil
155157 web_password_vault_item = node['concourse-ci']['docker-compose']['web_password_vault_item']
@@ -201,6 +203,12 @@ force_override_config_srvs['concourse-web']['environment'] = web_envs unless web
201203 # reset vlumes array.
202204 override_config_srvs['concourse-web']['volumes'] = web_vols unless web_vols.empty?
203205
206+# Worker
207+worker_vols = config_srvs['concourse-worker']['volumes'].to_a
208+worker_vols.push("#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/concourse-keys")
209+# reset vlumes array.
210+override_config_srvs['concourse-worker']['volumes'] = worker_vols unless worker_vols.empty?
211+
204212 template env_file do
205213 source 'opt/docker-compose/app/concourse/.env'
206214 owner 'root'
Afficher sur ancien navigateur de dépôt.