kitchen-docker_cli 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c9c4456fdccbcadfaf197bfff4bae971e77223a
-  data.tar.gz: 1b87bccb3bbacd66150b6a0e0422777bad742af3
+  metadata.gz: 86d1304084493a93678033f12fb9c16782cb72d4
+  data.tar.gz: 225c65f8e05d2eea4ae1376d4a0dd8028afa52dc
 SHA512:
-  metadata.gz: 98f996d40938f78ccd4698204874f0f6781764b850ed5919a5e5ea53e9d6016494abe17aa9ee7ab47de5c8c4e57158da63963e41d9b1e5c68df985c6d9417947
-  data.tar.gz: 02c9683adb5a47fee7463391d45edc7200e2900852764dc44292aab47be4689a349a8feba93e93fe320cdc23757ef006832f09e246c82486dd31a7c10e3fb372
+  metadata.gz: a78202c0d1dc6344ac7c79aac2cd11ed7694ced1e475dc687a4dd4af1f238341179a0b24117ecb7ed22ac062928c6f20a5d20ed8685541348147d481ebd7957c
+  data.tar.gz: b97a94d845e713af5f7336b5a79cbd1b16919f17cc48f00c1c978e5bea59fdb92e6f5c1db23dd89fc7e45a15bfd0ffdbbce243ede8bebb377cb3f174cee422ef

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.0
+
+* Change custom Dockerfile to ERB template [#11][] [#12][]
+
 ## 0.8.1
 
 * Support test-kitchen `1.4.0`
@@ -51,5 +55,7 @@
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#2]: https://github.com/marcy-terui/kitchen-docker_cli/issues/2
 [#4]: https://github.com/marcy-terui/kitchen-docker_cli/issues/4
+[#11]: https://github.com/marcy-terui/kitchen-docker_cli/issues/11
+[#12]: https://github.com/marcy-terui/kitchen-docker_cli/issues/12
 [@grubernaut]: https://github.com/grubernaut
-[@hd-deman]: https://github.com/hd-deman
+[@hd-deman]: https://github.com/hd-deman

data/README.md

@@ -257,7 +257,8 @@ Examples:
 
 ### dockerfile
 
-Create test image using a supplied dockerfile, instead of the default dockerfile created.  
+Create test image using a supplied Dockerfile, instead of the default Dockerfile created.  
+And it can be written as ERB template.  
 For best results, please:  
   - Ensure Package Repositories are updated
   - Ensure Dockerfile installs sudo, curl, and tar
@@ -267,6 +268,44 @@ For best results, please:
   dockerfile: my/dockerfile
 ```
 
+### dockerfile_vars
+Template variables for the custom Dockerfile.
+
+Example:
+
+- .kitchen.yml
+
+```yml
+driver:
+  image: marcy/hoge
+  dockerfile: dockerfile.erb
+  dockerfile_vars:
+    envs:
+      LANG: ja_JP.UTF-8
+    cmds:
+      - yum -y install httpd
+```
+
+- dockerfile.erb
+
+```erb
+FROM <%= config[:image] %>
+<% @envs.each do |k,v| %>
+ENV <%= k %> <%= v %>
+<% end %>
+<% @cmds.each do |c| %>
+RUN <%= c %>
+<% end %>
+```
+
+- Result
+
+```
+FROM marcy/hoge
+ENV LANG ja_JP.UTF-8
+RUN yum -y install httpd
+```
+
 ### memory_limit
 
 Constrain the memory available.

data/lib/kitchen/docker_cli/dockerfile_template.rb

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Masashi Terui (<marcy9114@gmail.com>)
+#
+# Copyright (C) 2015, Masashi Terui
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'erb'
+
+module Kitchen
+
+  module DockerCli
+
+    class DockerfileTemplate
+      def initialize(vars={}, config={})
+        vars.each do |k, v|
+          instance_variable_set("@#{k.to_s}", v)
+        end
+        self.class.class_eval <<-EOF
+          def config
+            return #{config.to_s}
+          end
+        EOF
+      end
+
+      def result
+        ERB.new(IO.read(File.expand_path(config[:dockerfile]))).result(binding)
+      end
+    end
+  end
+end

data/lib/kitchen/driver/docker_cli.rb

@@ -17,6 +17,7 @@
 # limitations under the License.
 
 require 'kitchen'
+require 'kitchen/docker_cli/dockerfile_template'
 
 module Kitchen
 
@@ -121,7 +122,10 @@ module Kitchen
 
       def docker_file
         if config[:dockerfile]
-          file = IO.read(File.expand_path(config[:dockerfile]))
+          file = ::Kitchen::DockerCli::DockerfileTemplate.new(
+            config[:dockerfile_vars],
+            config.to_hash
+          ).result
         else
           file = ["FROM #{config[:image]}"]
           case config[:platform]
@@ -134,8 +138,8 @@ module Kitchen
           else
             # TODO: Support other distribution
           end
-          Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
           Array(config[:environment]).each { |env, value| file << "ENV #{env}=#{value}" }
+          Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
           file.join("\n")
         end
       end

data/lib/kitchen/driver/docker_cli_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for DockerCli Kitchen driver
-    DOCKER_CLI_VERSION = '0.8.1'
+    DOCKER_CLI_VERSION = '0.9.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -210,13 +210,29 @@ describe Kitchen::Driver::DockerCli, "docker_file" do
       }
     }
     example do
-      ret = "FROM ubuntu/12.04\n"
       ret = "FROM ubuntu/12.04\n"
       ret << "RUN apt-get update\n"
       ret << "RUN apt-get -y install sudo curl tar\n"
+      ret << "ENV test=hoge\n"
       ret << "RUN test\n"
-      ret << "RUN test2\n"
-      ret << "ENV test=hoge"
+      ret << "RUN test2"
+      expect(@docker_cli.send(:docker_file)).to eq ret
+    end
+  end
+  context 'dockerfile template' do
+    let(:config) {
+      {
+        image: "ubuntu/12.04",
+        platform: "ubuntu",
+        dockerfile: File.join(File.dirname(__FILE__), 'dockerfile.erb'),
+        dockerfile_vars: {"LANG" => "ja_JP.UTF-8"}
+      }
+    }
+    example do
+      ret = <<-EOH
+FROM ubuntu/12.04
+ENV LANG ja_JP.UTF-8
+EOH
       expect(@docker_cli.send(:docker_file)).to eq ret
     end
   end

data/spec/kitchen/driver/dockerfile.erb

@@ -0,0 +1,2 @@
+FROM <%= config[:image] %>
+ENV LANG <%= @LANG %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -121,10 +121,12 @@ files:
 - integration-test/test/integration/default/serverspec/default_spec.rb
 - integration-test/test/integration/default/serverspec/spec_helper.rb
 - kitchen-docker_cli.gemspec
+- lib/kitchen/docker_cli/dockerfile_template.rb
 - lib/kitchen/driver/docker_cli.rb
 - lib/kitchen/driver/docker_cli_version.rb
 - lib/kitchen/transport/docker_cli.rb
 - spec/kitchen/driver/docker_cli_spec.rb
+- spec/kitchen/driver/dockerfile.erb
 - spec/spec_helper.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
@@ -152,4 +154,5 @@ specification_version: 4
 summary: A Test Kitchen Driver for Docker native CLI
 test_files:
 - spec/kitchen/driver/docker_cli_spec.rb
+- spec/kitchen/driver/dockerfile.erb
 - spec/spec_helper.rb