kitchen-docker_cli 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3269fa4b33bf25f161bcd1af841c00cce6f2cbe6
-  data.tar.gz: af1dc072ceb79cb73c0781ec776527d23c150875
+  metadata.gz: 269cdc729259a150aabef82e1130c4f34b13696d
+  data.tar.gz: df9fc2594c21b0ac3deb39edf64fc8c776be291b
 SHA512:
-  metadata.gz: d875cd82bf9fe83e52b2c179f3968068b6a40d9b57338456b7b6dba0295d268907639efe7f3aa92c5d62747d00f4586f3e83ff41c58095baf4bba6e4c3d965fe
-  data.tar.gz: 39463c201c7f8ef0f01d3671ac196a62e3c5bbadd217ad3c243cca83b6664c3a6908d79c3d63169063ac2d603e0e4b1b552c5e9ae1fa8c85ed95711efdae47fa
+  metadata.gz: ce42a96a832da5482c73175da995aee0337b1124ed063d10b3dc967379e5fddef5d749a51e86c9ea47e04c12b9fb521558d1d3bf88c3cdcfe73799db5ce70161
+  data.tar.gz: 9169f49be1e7593484c5f2db6c1fbac998737d5897b98b6d5618b898253ae7da2a4425a2109103f54847325f89874f4dcbf7472e9b694f85ea73f19dcc9a973e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.15.0
+
+- Add `skip_preparation` option
+
 ## 0.14.2
 
 * Fix error on Circle-CI

data/README.md

@@ -141,6 +141,19 @@ Examples:
   no_cache: true
 ```
 
+### skip_preparation
+
+Skip the automatically preparation in the step to building Docker image.  
+(i.e. Just pulling the image)
+
+The default value is `false`.
+
+Examples:
+
+```yml
+  skip_preparation: true
+```
+
 ### privileged
 
 Give extended privileges to the suite container.

data/lib/kitchen/driver/docker_cli.rb

@@ -35,6 +35,7 @@ module Kitchen
       default_config :instance_host_name, false
       default_config :transport, "docker_cli"
       default_config :dockerfile_vars, {}
+      default_config :skip_preparation, false
 
       default_config :image do |driver|
         driver.default_image
@@ -142,16 +143,18 @@ module Kitchen
           ).result
         else
           file = ["FROM #{config[:image]}"]
-          case config[:platform]
-          when 'debian', 'ubuntu'
-            file << 'RUN apt-get update'
-            file << 'RUN apt-get -y install sudo curl tar'
-          when 'rhel', 'centos', 'fedora'
-            file << 'RUN yum clean all'
-            file << 'RUN yum -y install sudo curl tar'
-            file << 'RUN echo "Defaults:root !requiretty" >> /etc/sudoers'
-          else
-            # TODO: Support other distribution
+          unless config[:skip_preparation]
+            case config[:platform]
+            when 'debian', 'ubuntu'
+              file << 'RUN apt-get update'
+              file << 'RUN apt-get -y install sudo curl tar'
+            when 'rhel', 'centos', 'fedora'
+              file << 'RUN yum clean all'
+              file << 'RUN yum -y install sudo curl tar'
+              file << 'RUN echo "Defaults:root !requiretty" >> /etc/sudoers'
+            else
+              # TODO: Support other distribution
+            end
           end
           Array(config[:environment]).each { |env, value| file << "ENV #{env}=#{value}" }
           Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }

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.14.2'
+    DOCKER_CLI_VERSION = '0.15.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -214,6 +214,20 @@ describe Kitchen::Driver::DockerCli, "#docker_file" do
     end
   end
 
+  context 'enable skip_preparation' do
+    let(:config) do
+      {
+        image: "centos/centos6",
+        platform: "centos",
+        skip_preparation: true
+      }
+    end
+    example do
+      ret = "FROM centos/centos6"
+      expect(@docker_cli.send(:docker_file)).to eq ret
+    end
+  end
+
   context 'set run_command' do
     let(:config) {
       {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen