• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

リビジョンc0c53de9edb149d3ae7a9512805172781c614fd3 (tree)
日時2018-05-06 12:26:10
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

updates concourse-on-docker role.

変更サマリ

差分

--- a/roles/concourse-on-docker.rb
+++ b/roles/concourse-on-docker.rb
@@ -1,5 +1,5 @@
11 #
2-# Copyright 2017, whitestar
2+# Copyright 2017-2018, whitestar
33 #
44 # Licensed under the Apache License, Version 2.0 (the "License");
55 # you may not use this file except in compliance with the License.
@@ -53,8 +53,8 @@ override_attributes(
5353 #'common_name' => concourse_cn,
5454 },
5555 'docker-compose' => {
56+ # Version 1 docker-compose format (default)
5657 'config' => {
57- # Version 1 docker-compose format
5858 'concourse-web' => {
5959 'image' => image,
6060 #'ports' => [
@@ -80,6 +80,38 @@ override_attributes(
8080 'image' => image,
8181 },
8282 },
83+=begin
84+ # Version 2 docker-compose format
85+ 'config_format_version' => '2',
86+ 'config' => {
87+ 'services' => {
88+ 'concourse-web' => {
89+ 'image' => image,
90+ #'ports' => [
91+ #"#{port}:8080", # If you sepecify no value, Chef will sets '8080:8080'.
92+ #"#{port}:8443", # for https
93+ #],
94+ 'environment' => {
95+ #'CONCOURSE_RESOURCE_CHECKING_INTERVAL' => '1m',
96+ # If you sepecify no value, Chef will sets "http://#{node['ipaddress']}:8080".
97+ #'CONCOURSE_EXTERNAL_URL' => "http://192.168.1.3:#{port}", # or "https://192.168.1.3:#{port}"
98+ #'CONCOURSE_TLS_BIND_PORT' => '8443', # activate HTTPS
99+ # These environments will be set by the concourse-ci::docker-compose recipe automatically.
100+ #'CONCOURSE_TLS_CERT' => '/root/server.crt',
101+ #'CONCOURSE_TLS_KEY' => '/root/server.key',
102+ },
103+ #'volumes' => [
104+ # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
105+ #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
106+ #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
107+ #],
108+ },
109+ 'concourse-worker' => {
110+ 'image' => image,
111+ },
112+ },
113+ },
114+=end
83115 },
84116 },
85117 )
旧リポジトリブラウザで表示