updates concourse-on-docker role.

[metasearch/grid-chef-repo.git] / roles / concourse-on-docker.rb

diff --git a/roles/concourse-on-docker.rb b/roles/concourse-on-docker.rb
index e3cd88c..6fabd50 100644 (file)
--- a/roles/concourse-on-docker.rb
+++ b/roles/concourse-on-docker.rb
@@ -1,5 +1,5 @@
 #
-# 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.
@@ -53,8 +53,8 @@ override_attributes(
       #'common_name' => concourse_cn,
     },
     'docker-compose' => {
+      # Version 1 docker-compose format (default)
       'config' => {
-        # Version 1 docker-compose format
         'concourse-web' => {
           'image' => image,
           #'ports' => [
@@ -80,6 +80,38 @@ override_attributes(
           'image' => image,
         },
       },
+=begin
+      # Version 2 docker-compose format
+      'config_format_version' => '2',
+      'config' => {
+        'services' => {
+          'concourse-web' => {
+            'image' => image,
+            #'ports' => [
+              #"#{port}:8080",  # If you sepecify no value, Chef will sets '8080:8080'.
+              #"#{port}:8443",  # for https
+            #],
+            'environment' => {
+              #'CONCOURSE_RESOURCE_CHECKING_INTERVAL' => '1m',
+              # If you sepecify no value, Chef will sets "http://#{node['ipaddress']}:8080".
+              #'CONCOURSE_EXTERNAL_URL' => "http://192.168.1.3:#{port}",  # or "https://192.168.1.3:#{port}"
+              #'CONCOURSE_TLS_BIND_PORT' => '8443',  # activate HTTPS
+              # These environments will be set by the concourse-ci::docker-compose recipe automatically.
+              #'CONCOURSE_TLS_CERT' => '/root/server.crt',
+              #'CONCOURSE_TLS_KEY' => '/root/server.key',
+            },
+            #'volumes' => [
+              # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
+              #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
+              #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
+            #],
+          },
+          'concourse-worker' => {
+            'image' => image,
+          },
+        },
+      },
+=end
     },
   },
 )