docker-builder 0.1.20 → 0.1.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f486281f9de1a90cb945ae0051ee913ba98c606d
4
- data.tar.gz: c1eacce264f871d5bdb3aa329c0ed8e5773020b0
3
+ metadata.gz: 047aad08d949104ac5a24e2718596a8d2310eeb8
4
+ data.tar.gz: 5b47426f4cf4922acc0caa9cea7f6050f1e8ae63
5
5
  SHA512:
6
- metadata.gz: 6edb2af5081cb7f2cccea9970b94dacf573178b9fb79182d1e33683c4111b353fbb103f7352a838e9b5624778ca0b5d1be177f52946288735a408de9e3e69f7b
7
- data.tar.gz: 5c224db45f918ff868bf6ee947870e56a6296ba65935bb8c12c93d92cad6faa831087093eb5c217c59b1caca02d67d2a3242311639a2e858f839a42935f38e80
6
+ metadata.gz: 1388c814c45f75131dd709eb1854c3b5b2516e532875dd270428e6f95cec2a3658de290e79d474e50794e4986a1e2f918a98694ad118458145e5e02433255f7b
7
+ data.tar.gz: 7104db5ba5249fc31c415787c11a92d2fd9c6b6d4b1cd418999c40b7de85e3fdc297b7852c34d3641964927236856827abff0e4e688708137ea3d658bd66c809
data/install_local.sh CHANGED
@@ -1,2 +1,2 @@
1
1
  gem build docker-builder.gemspec
2
- gem install ./docker-builder-0.1.20.gem
2
+ gem install ./docker-builder-0.1.21.gem
@@ -36,8 +36,6 @@ cookbooks_paths = [
36
36
  #File.join(root, '../cookbooks'),
37
37
  #File.join(root, '../', node_name, 'cookbooks'),
38
38
 
39
- #'/mnt/data/projects/mmx/chef-repo/cookbooks-common',
40
- #'/mnt/data/projects/mmx/chef-repo/cookbooks',
41
39
  #'/work/chef-repo/cookbooks-common',
42
40
  #'/work/chef-repo/cookbooks',
43
41
 
@@ -51,10 +49,15 @@ cookbooks_paths.reject!{|f| !Dir.exists?(f)}
51
49
 
52
50
 
53
51
  # load another knife file
54
- knife_custom_files = [
55
- File.expand_path(".chef/knife.rb", server_base_dir),
56
- File.expand_path("../../.chef/knife.rb", server_base_dir),
57
- ]
52
+ knife_custom_files = []
53
+
54
+ if server_base_dir
55
+ knife_custom_files = [
56
+ File.expand_path(".chef/knife.rb", server_base_dir),
57
+ File.expand_path("../../.chef/knife.rb", server_base_dir),
58
+ ]
59
+ end
60
+
58
61
  #File.expand_path("../../examples/example-nginx/servers/#{my_server_name}/.chef/knife.rb", __FILE__)
59
62
 
60
63
  knife_custom_files.each do |file_knife_custom|
@@ -1,3 +1,3 @@
1
1
  module DockerBuilder
2
- VERSION = "0.1.20"
2
+ VERSION = "0.1.21"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.20
4
+ version: 0.1.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - Max Ivak
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-01-03 00:00:00.000000000 Z
11
+ date: 2017-01-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler