includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically.

diff --git a/cookbooks/concourse-ci/CHANGELOG.md b/cookbooks/concourse-ci/CHANGELOG.md
index aff2117..4b2648e 100644 (file)
--- a/cookbooks/concourse-ci/CHANGELOG.md
+++ b/cookbooks/concourse-ci/CHANGELOG.md
@@ -1,6 +1,10 @@
 concourse-ci CHANGELOG
 ======================
 
+0.2.2
+-----
+- includes the `ssl_cert::server_key_pairs` and `ssl_cert::ca_certs` recipes automatically.
+
 0.2.1
 -----
 - refactoring.

diff --git a/cookbooks/concourse-ci/README.md b/cookbooks/concourse-ci/README.md
index 0653e20..2a5d9a0 100644 (file)
--- a/cookbooks/concourse-ci/README.md
+++ b/cookbooks/concourse-ci/README.md
@@ -37,7 +37,7 @@ This cookbook sets up a Concourse CI service by Docker Compose.
 
 |Key|Type|Description, example|Default|
 |:--|:--|:--|:--|
-|`['concourse-ci']['fly']['version']`|String||`'2.7.0'`|
+|`['concourse-ci']['fly']['version']`|String||`'3.3.4'`|
 |`['concourse-ci']['fly']['release_url']`|String||`"https://github.com/concourse/concourse/releases/download/v#{node['concourse-ci']['fly']['version']}/fly_linux_amd64"`|
 |`['concourse-ci']['fly']['release_checksum']`|String||`nil`|
 |`['concourse-ci']['fly']['auto_upgrade']`|Boolean||`false`|
@@ -92,7 +92,7 @@ run_list(
   'recipe[concourse-ci::docker-compose]',
 )
 
-image = 'concourse/concourse:2.7.0'
+image = 'concourse/concourse:latest'
 port = '18080'
 
 override_attributes(
@@ -134,7 +134,7 @@ name 'concourse-with-ssl'
 description 'Concourse with SSL'
 
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # concourse-ci <= 0.2.1
   'role[docker]',
   'recipe[concourse-ci::docker-compose]',
 )
@@ -196,13 +196,13 @@ name 'concourse-with-oauth'
 description 'Concourse with OAuth'
 
 run_list(
-  'recipe[ssl_cert::ca_certs]',
+  #'recipe[ssl_cert::ca_certs]',  # concourse-ci <= 0.2.1
   'recipe[ssl_cert::server_key_pairs]',
   'role[docker]',
   'recipe[concourse-ci::docker-compose]',
 )
 
-image = 'concourse/concourse:2.7.0'
+image = 'concourse/concourse:latest'
 port = '18443'
 ca_name = 'grid_ca'
 cn = 'concourse.io.example.com'
@@ -270,19 +270,19 @@ override_attributes(
 - create vault items.
 
 ```text
-$ ruby -rjson -e 'puts JSON.generate({"private" => File.read("concourse_io_example_com.prod.key")})' \
-> > ~/tmp/concourse_io_example_com.prod.key.json
+$ ruby -rjson -e 'puts JSON.generate({"private" => File.read("concourse.io.example.com.prod.key")})' \
+> > ~/tmp/concourse.io.example.com.prod.key.json
 
-$ ruby -rjson -e 'puts JSON.generate({"public" => File.read("concourse_io_example_com.prod.crt")})' \
-> > ~/tmp/concourse_io_example_com.prod.crt.json
+$ ruby -rjson -e 'puts JSON.generate({"public" => File.read("concourse.io.example.com.prod.crt")})' \
+> > ~/tmp/concourse.io.example.com.prod.crt.json
 
 $ cd $CHEF_REPO_PATH
 
 $ knife vault create ssl_server_keys concourse.io.example.com.prod \
-> --json ~/tmp/concourse_io_example_com.prod.key.json
+> --json ~/tmp/concourse.io.example.com.prod.key.json
 
 $ knife vault create ssl_server_certs concourse.io.example.com.prod \
-> --json ~/tmp/concourse_io_example_com.prod.crt.json
+> --json ~/tmp/concourse.io.example.com.prod.crt.json
 ```
 
 - grant reference permission to the Concourse host
@@ -296,7 +296,7 @@ $ knife vault update ssl_server_certs concourse.io.example.com.prod -S 'name:con
 
 ```ruby
 run_list(
-  'recipe[ssl_cert::server_key_pairs]',
+  #'recipe[ssl_cert::server_key_pairs]',  # concourse-ci <= 0.2.1
   'recipe[concourse-ci::docker-compose]',
 )
 

diff --git a/cookbooks/concourse-ci/attributes/default.rb b/cookbooks/concourse-ci/attributes/default.rb
index 329d720..8bc9080 100644 (file)
--- a/cookbooks/concourse-ci/attributes/default.rb
+++ b/cookbooks/concourse-ci/attributes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-default['concourse-ci']['fly']['version'] = '2.7.0'
+default['concourse-ci']['fly']['version'] = '3.3.4'
 default['concourse-ci']['fly']['release_url'] = "https://github.com/concourse/concourse/releases/download/v#{node['concourse-ci']['fly']['version']}/fly_linux_amd64"
 default['concourse-ci']['fly']['release_checksum'] = nil
 default['concourse-ci']['fly']['auto_upgrade'] = false

diff --git a/cookbooks/concourse-ci/concourse.yml b/cookbooks/concourse-ci/concourse.yml
index 913941e..037e48a 100644 (file)
--- a/cookbooks/concourse-ci/concourse.yml
+++ b/cookbooks/concourse-ci/concourse.yml
@@ -1,19 +1,8 @@
 ---
 # $ fly -t target sp -p concourse-ci-cookbook -c concourse.yml -l fly-vars.yml -l ~/sec/credentials-prod.yml
-resource_types:
-- name: ya-git
-  type: docker-image
-  source:
-    repository: whitestar/git-resource
-    registry_mirror: https://((registry-mirror-domain))
-    ca_certs:
-    - domain: ((registry-mirror-domain))
-      cert: ((docker-reg-ca-cert))
-
 resources:
 - name: src-git
-  type: ya-git
-  #type: git
+  type: git
   source:
     uri: ((git-id-osdn))@git.osdn.net:/gitroot/metasearch/grid-chef-repo.git
     branch: master
@@ -35,7 +24,7 @@ resources:
   check_every: 12h  # default: 1m
 
 jobs:
-- name: build-cookbook
+- name: test-cookbook
   plan:
   - aggregate:
     - get: src-git
@@ -79,7 +68,9 @@ jobs:
       params:
         depth: 5
       trigger: false
+      passed: [test-cookbook]
     - get: chefdk-cache
+      passed: [test-cookbook]
   - task: publish
     image: chefdk-cache
     params:
@@ -106,5 +97,4 @@ jobs:
       tag_prefix: ((cookbook-name))-
       tag: src-git/cookbooks/((cookbook-name))/version
       only_tag: true
-      annotate: src-git/cookbooks/((cookbook-name))/version
-      #annotate:   # path to a file containing the annotation message.
+      annotate: ../src-git/cookbooks/((cookbook-name))/version

diff --git a/cookbooks/concourse-ci/recipes/docker-compose.rb b/cookbooks/concourse-ci/recipes/docker-compose.rb
index 9d4afe2..f0fe9a9 100644 (file)
--- a/cookbooks/concourse-ci/recipes/docker-compose.rb
+++ b/cookbooks/concourse-ci/recipes/docker-compose.rb
@@ -17,8 +17,6 @@
 # limitations under the License.
 #
 
-::Chef::Recipe.send(:include, SSLCert::Helper)
-
 require 'securerandom'
 
 doc_url = 'https://concourse.ci/docker-repository.html'
@@ -220,7 +218,9 @@ template "#{bin_dir}/concourse_up" do
 end
 
 if node['concourse-ci']['with_ssl_cert_cookbook']
+  include_recipe 'ssl_cert::server_key_pairs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
+
   cn = node['concourse-ci']['ssl_cert']['common_name']
   # Concourse web process owner is root.
   web_vols.push("#{server_cert_path(cn)}:/root/server.crt:ro")
@@ -235,7 +235,9 @@ worker_vols.push("#{node['concourse-ci']['docker-compose']['worker_keys_dir']}:/
 
 # Common
 if node['concourse-ci']['docker-compose']['import_ca']
+  include_recipe 'ssl_cert::ca_certs'
   ::Chef::Recipe.send(:include, SSLCert::Helper)
+
   node['concourse-ci']['ssl_cert']['ca_names'].each {|ca_name|
     ca_cert_vol = "#{ca_cert_path(ca_name)}:/usr/share/ca-certificates/#{ca_name}.crt:ro"
     web_vols.push(ca_cert_vol)

diff --git a/cookbooks/concourse-ci/version b/cookbooks/concourse-ci/version
index 0c62199..ee1372d 100644 (file)
--- a/cookbooks/concourse-ci/version
+++ b/cookbooks/concourse-ci/version
@@ -1 +1 @@
-0.2.1
+0.2.2