knife-container 0.2.2 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0762801f48d47bf6fb8b384271b12fa76d542b7e
|
4
|
+
data.tar.gz: c5d67630c01a71288b938f4141f62d992f04b04e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 40ee4022ad4c32d3cddb1afdf63284be14e77dc1b5d4ac97dc9f634af4062472f64b75538a02531a3fe223dc4b34054549bf9b74081bd0fe68893749a383647b
|
7
|
+
data.tar.gz: 9a90f07e168ecb9895338660600fe710583dd6bba3b0ef17d4b6a6487ec883facffc77b3084fb655d1aca5d38392d7d844012a5db5f7f23f392475b1b0bdaf34
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,12 @@
|
|
1
1
|
# Knife Container Changelog
|
2
2
|
|
3
|
+
## v0.2.4 (2014-09-19)
|
4
|
+
* Fast followup fix to v0.2.3 - fix `--dockerfiles-path` parameter for build.
|
5
|
+
|
6
|
+
## v0.2.3 (2014-09-19)
|
7
|
+
* [GH-39] Fixed `--dockerfiles-path` parameter which did not properly accept input.
|
8
|
+
* [GH-38] Fixed issue where cookbooks would appear more than once in the Berksfile.
|
9
|
+
|
3
10
|
## v0.2.2 (2014-09-08)
|
4
11
|
* [GH-34] Update gemspec to support Chef12.
|
5
12
|
|
@@ -55,8 +55,7 @@ class Chef
|
|
55
55
|
option :dockerfiles_path,
|
56
56
|
:short => "-d PATH",
|
57
57
|
:long => "--dockerfiles-path PATH",
|
58
|
-
:description => "Path to the directory where Docker contexts are kept"
|
59
|
-
:proc => Proc.new { |d| Chef::Config[:knife][:dockerfiles_path] = d }
|
58
|
+
:description => "Path to the directory where Docker contexts are kept"
|
60
59
|
|
61
60
|
#
|
62
61
|
# Run the plugin
|
@@ -98,8 +97,7 @@ class Chef
|
|
98
97
|
# Set defaults for configuration values
|
99
98
|
#
|
100
99
|
def setup_config_defaults
|
101
|
-
Chef::Config[:knife][:dockerfiles_path]
|
102
|
-
config[:dockerfiles_path] = Chef::Config[:knife][:dockerfiles_path]
|
100
|
+
config[:dockerfiles_path] ||= Chef::Config[:knife][:dockerfiles_path] || File.join(Chef::Config[:chef_repo_path], 'dockerfiles')
|
103
101
|
|
104
102
|
# Determine if we are running local or server mode
|
105
103
|
case
|
@@ -108,8 +108,7 @@ class Chef
|
|
108
108
|
option :dockerfiles_path,
|
109
109
|
:short => "-d PATH",
|
110
110
|
:long => "--dockerfiles-path PATH",
|
111
|
-
:description => "Path to the directory where Docker contexts are kept"
|
112
|
-
:proc => Proc.new { |d| Chef::Config[:knife][:dockerfiles_path] = d }
|
111
|
+
:description => "Path to the directory where Docker contexts are kept"
|
113
112
|
|
114
113
|
#
|
115
114
|
# Run the plugin
|
@@ -175,8 +174,7 @@ class Chef
|
|
175
174
|
|
176
175
|
config[:run_list] ||= []
|
177
176
|
|
178
|
-
Chef::Config[:knife][:dockerfiles_path]
|
179
|
-
config[:dockerfiles_path] = Chef::Config[:knife][:dockerfiles_path]
|
177
|
+
config[:dockerfiles_path] ||= Chef::Config[:knife][:dockerfiles_path] || File.join(Chef::Config[:chef_repo_path], 'dockerfiles')
|
180
178
|
end
|
181
179
|
|
182
180
|
#
|
@@ -71,13 +71,11 @@ run_list_items.each do |item|
|
|
71
71
|
end
|
72
72
|
|
73
73
|
# Generate Berksfile from runlist
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
only_if { context.generate_berksfile }
|
80
|
-
end
|
74
|
+
template File.join(dockerfile_dir, 'Berksfile') do
|
75
|
+
source 'berksfile.erb'
|
76
|
+
variables :cookbooks => cookbooks.uniq
|
77
|
+
helpers(KnifeContainer::Generator::TemplateHelper)
|
78
|
+
only_if { context.generate_berksfile }
|
81
79
|
end
|
82
80
|
|
83
81
|
# Copy over the necessary directories into the temp chef-repo (if local-mode)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-container
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Tom Duffield
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-09-
|
11
|
+
date: 2014-09-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chef
|
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
210
210
|
version: '0'
|
211
211
|
requirements: []
|
212
212
|
rubyforge_project:
|
213
|
-
rubygems_version: 2.2.
|
213
|
+
rubygems_version: 2.2.2
|
214
214
|
signing_key:
|
215
215
|
specification_version: 4
|
216
216
|
summary: Container support for Chef's Knife Command
|