diff --git a/.delivery/build-cookbook/Berksfile b/.delivery/build-cookbook/Berksfile index 80ee05020..39f8f2f50 100644 --- a/.delivery/build-cookbook/Berksfile +++ b/.delivery/build-cookbook/Berksfile @@ -3,6 +3,8 @@ source 'https://supermarket.chef.io' metadata group :delivery do + cookbook 'delivery-sugar-extras', git: 'https://github.com/chef-cookbooks/delivery-sugar-extras.git' + cookbook 'delivery-sugar', git: 'https://github.com/chef-cookbooks/delivery-sugar.git' cookbook 'delivery_build', git: 'https://github.com/chef-cookbooks/delivery_build' - cookbook 'test', path: './test/fixtures/cookbooks/test' + cookbook 'delivery-truck', git: 'https://github.com/chef-cookbooks/delivery-truck.git' end diff --git a/.delivery/build-cookbook/metadata.rb b/.delivery/build-cookbook/metadata.rb index 534ed0f15..f0aaf855c 100644 --- a/.delivery/build-cookbook/metadata.rb +++ b/.delivery/build-cookbook/metadata.rb @@ -6,3 +6,5 @@ version '0.1.0' depends 'docker', '~> 1.0' depends 'fancy_execute' +depends 'delivery-truck' +depends 'delivery-sugar-extras' diff --git a/.delivery/build-cookbook/recipes/default.rb b/.delivery/build-cookbook/recipes/default.rb index 8aba0cf52..2b1e483bc 100644 --- a/.delivery/build-cookbook/recipes/default.rb +++ b/.delivery/build-cookbook/recipes/default.rb @@ -4,12 +4,26 @@ # # Copyright (c) 2015 Chef Software Inc., All Rights Reserved. +include_recipe 'delivery-truck::default' + +# create a persistant gem cache per builder for the entire project +gem_cache = File.join(node['delivery']['workspace']['root'], "../../../project_gem_cache") +directory gem_cache do + # set the owner to the dbuild so that the other recipes can write to here + owner node['delivery_builder']['build_user'] + mode "0755" + recursive true + action :create +end + +# ensure we always have a docker group with the build user as a member group 'docker' do members [node['delivery_builder']['build_user']] end package 'build-essential' +# get docker docker_service 'dockerd' do action [:delete, :create, :start] host 'unix:///var/run/docker.sock' diff --git a/.delivery/config.json b/.delivery/config.json index ce6450834..91a479edc 100644 --- a/.delivery/config.json +++ b/.delivery/config.json @@ -4,6 +4,11 @@ "name": "build-cookbook", "path": ".delivery/build-cookbook" }, + "delivery-truck": { + "publish": { + "github": "chef/vulcanosec" + } + }, "skip_phases": [ "syntax", "security",