fix error when dockerfile_vars is nil #11

marcy-terui · Jun 12, 2015 · b5eabb3 · b5eabb3
1 parent b1324a5
commit b5eabb3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/lib/kitchen/docker_cli/dockerfile_template.rb b/lib/kitchen/docker_cli/dockerfile_template.rb
@@ -24,8 +24,10 @@ module DockerCli
 
     class DockerfileTemplate
       def initialize(vars={}, config={})
-        vars.each do |k, v|
-          instance_variable_set("@#{k.to_s}", v)
+        if vars.is_a?(Hash)
+          vars.each do |k, v|
+            instance_variable_set("@#{k.to_s}", v)
+          end
         end
         self.class.class_eval <<-EOF
           def config

diff --git a/lib/kitchen/driver/docker_cli.rb b/lib/kitchen/driver/docker_cli.rb
@@ -33,6 +33,7 @@ class DockerCli < Kitchen::Driver::Base
       default_config :privileged, false
       default_config :instance_host_name, false
       default_config :transport, "docker_cli"
+      default_config :dockerfile_vars, {}
 
       default_config :image do |driver|
         driver.default_image

diff --git a/spec/kitchen/driver/docker_cli_spec.rb b/spec/kitchen/driver/docker_cli_spec.rb
@@ -232,6 +232,22 @@
       ret = <<-EOH
 FROM ubuntu/12.04
 ENV LANG ja_JP.UTF-8
+EOH
+      expect(@docker_cli.send(:docker_file)).to eq ret
+    end
+  end
+  context 'dockerfile template when dockerfile_vars is nil' do
+    let(:config) {
+      {
+        image: "ubuntu/12.04",
+        platform: "ubuntu",
+        dockerfile: File.join(File.dirname(__FILE__), 'dockerfile_nil.erb'),
+        dockerfile_vars: nil
+      }
+    }
+    example do
+      ret = <<-EOH
+FROM ubuntu/12.04
 EOH
       expect(@docker_cli.send(:docker_file)).to eq ret
     end

diff --git a/spec/kitchen/driver/dockerfile_nil.erb b/spec/kitchen/driver/dockerfile_nil.erb
@@ -0,0 +1 @@
+FROM <%= config[:image] %>