From 58dc52be6189d16aae833c7b05fbff68a6e852a1 Mon Sep 17 00:00:00 2001 From: whitestar Date: Sun, 3 Sep 2017 20:48:40 +0900 Subject: [PATCH] bug fix. --- cookbooks/screwdriver/recipes/docker-compose.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/screwdriver/recipes/docker-compose.rb b/cookbooks/screwdriver/recipes/docker-compose.rb index 555cc71..63e2f9a 100644 --- a/cookbooks/screwdriver/recipes/docker-compose.rb +++ b/cookbooks/screwdriver/recipes/docker-compose.rb @@ -19,6 +19,8 @@ doc_url = 'https://hub.docker.com/r/screwdrivercd/screwdriver/' +::Chef::Recipe.send(:include, SSLCert::Helper) + #include_recipe 'platform_utils::kernel_user_namespace' include_recipe 'docker-grid::compose' @@ -227,7 +229,6 @@ ui_uri = api_uri.gsub(/:\d+/, ":#{ui_port}") # based on the API URI. if node['screwdriver']['with_ssl_cert_cookbook'] include_recipe 'ssl_cert::server_key_pairs' - ::Chef::Recipe.send(:include, SSLCert::Helper) cn = node['screwdriver']['ssl_cert']['common_name'] server_cert = server_cert_content(cn) @@ -300,7 +301,6 @@ store_envs['ECOSYSTEM_UI'] = ui_uri # Common if node['screwdriver']['docker-compose']['import_ca'] include_recipe 'ssl_cert::ca_certs' - ::Chef::Recipe.send(:include, SSLCert::Helper) node['screwdriver']['ssl_cert']['ca_names'].each {|ca_name| ca_cert_vol = "#{ca_cert_path(ca_name)}:/usr/share/ca-certificates/#{ca_name}.crt:ro" -- 2.11.0