Merged change 7a7300e7-d037-465f-9e90-cfd743b00173

From review branch _reviews/master/delivery-publish/2 into master

Signed-off-by: chartmann <chartmann@chef.io>

Reviewed-by: chartmann <chartmann@chef.io>
This commit is contained in:
Delivery Server 2015-10-01 21:21:55 +00:00
commit f4a7ee9af0
4 changed files with 24 additions and 1 deletions

View file

@ -3,6 +3,8 @@ source 'https://supermarket.chef.io'
metadata metadata
group :delivery do 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 '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 end

View file

@ -6,3 +6,5 @@ version '0.1.0'
depends 'docker', '~> 1.0' depends 'docker', '~> 1.0'
depends 'fancy_execute' depends 'fancy_execute'
depends 'delivery-truck'
depends 'delivery-sugar-extras'

View file

@ -4,12 +4,26 @@
# #
# Copyright (c) 2015 Chef Software Inc., All Rights Reserved. # 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 group 'docker' do
members [node['delivery_builder']['build_user']] members [node['delivery_builder']['build_user']]
end end
package 'build-essential' package 'build-essential'
# get docker
docker_service 'dockerd' do docker_service 'dockerd' do
action [:delete, :create, :start] action [:delete, :create, :start]
host 'unix:///var/run/docker.sock' host 'unix:///var/run/docker.sock'

View file

@ -4,6 +4,11 @@
"name": "build-cookbook", "name": "build-cookbook",
"path": ".delivery/build-cookbook" "path": ".delivery/build-cookbook"
}, },
"delivery-truck": {
"publish": {
"github": "chef/vulcanosec"
}
},
"skip_phases": [ "skip_phases": [
"syntax", "syntax",
"security", "security",