kitchen-docker_cli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5d519e17cf201875e9f656c36f4ecc2232146de
-  data.tar.gz: e2de2fd8103333bcf273e18744f576e29fc4601e
+  metadata.gz: 6b0d097399f490533674ea2fa855615f81995df6
+  data.tar.gz: 60cea728ef7e62c624913c930aabed2445a53d9f
 SHA512:
-  metadata.gz: e27530931d45ddda26a12400a592f72b8dc5d92da9c93829ddc2f967221981656fc2e3fd8c1e822206d13cb86d97491867ae32b1729d88cab1989641865198fd
-  data.tar.gz: d8ad115e33fac799bfbb36c722f84a72633bd604f4ad8391efbc01e9edd098832a0a3276f2968a2adfa4f5d4dbba1aecbfaace707aeb5dede549979e8c72f7f0
+  metadata.gz: 7dd67ba5691edebefd8c1d1c47c4fb52bec706fc280e089f065a756bef39fd152ce2348b699fb8c5efb0b5d8b5511fcf8348388780292b97b9e00d039fc94d32
+  data.tar.gz: 8a76f858b39728ad3584695a331943e56f689c56a055429063289ec5b6c4e7944edb2063e2754af0457c7c4ce4a39e2098ada126c0dfb5277787df1a841f13ed

data/.kitchen.yml

@@ -8,5 +8,3 @@ platforms:
 
 suites:
   - name: default
-    run_list:
-    attributes:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.0
+
+* Pull request [#2][]: Add custom `Dockerfile` support ([@grubernaut][])
+
 ## 0.3.1
 
 * Change dependency version of `test-kitchen`
@@ -17,3 +21,7 @@
 ## 0.1.0.alpha
 
 * Initial release
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#2]: https://github.com/marcy-terui/kitchen-docker_cli/issues/2
+[@grubernaut]: https://github.com/grubernaut

data/README.md

@@ -1,17 +1,17 @@
 # <a name="title"></a> Kitchen::DockerCli [![Gem Version](https://badge.fury.io/rb/kitchen-docker_cli.svg)](http://badge.fury.io/rb/kitchen-docker_cli) [![Build Status](https://travis-ci.org/marcy-terui/kitchen-docker_cli.svg?branch=master)](https://travis-ci.org/marcy-terui/kitchen-docker_cli) [![Coverage Status](https://coveralls.io/repos/marcy-terui/kitchen-docker_cli/badge.png)](https://coveralls.io/r/marcy-terui/kitchen-docker_cli)
 A Test Kitchen Driver for Docker command line interface.
 
-This plugin is created with only Docker CLI functions.  
+This plugin is created with only Docker CLI functions.
 Therefore, we can test with an environment that has no extra software such as ```sshd```.
 
 ## <a name="requirements"></a> Requirements
 
 - Test-Kitchen (>= 1.3)
 
-- Docker (>= 1.3)  
+- Docker (>= 1.3)
 This driver uses ```docker exec``` command.
 
-- tar (GNU Tar)  
+- tar (GNU Tar)
 
 ## <a name="installation"></a> Installation and Setup
 
@@ -146,8 +146,6 @@ Examples:
  link: mysql:db
 ```
 
-Examples:
-
 ```yml
   link:
     - mysql:db
@@ -156,7 +154,7 @@ Examples:
 
 ### publish_all
 
-Publish all exposed ports to the host interfaces.  
+Publish all exposed ports to the host interfaces.
 This option used to communicate between some containers.
 
 The default value is `false`.
@@ -183,6 +181,18 @@ Examples:
     - <%= Dir::pwd %>:/var:rw
 ```
 
+### dockerfile
+
+Create test image using a supplied dockerfile, instead of the default dockerfile created.
+For best results, please:
+  - Ensure Package Repositories are updated
+  - Ensure Dockerfile installs sudo, curl and tar
+  - If Ubuntu/Debian, Set DEBIAN_FRONTEND to noninteractive
+
+```yml
+  dockerfile: my/dockerfile
+```
+
 ## <a name="development"></a> Development
 
 * Source hosted at [GitHub][repo]

data/lib/kitchen/driver/docker_cli.rb

@@ -170,19 +170,23 @@ module Kitchen
       end
 
       def docker_file
-        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'
-          file << 'RUN yum clean all'
-          file << 'RUN yum -y install sudo curl tar'
+        if config[:dockerfile]
+          file = IO.read(File.expand_path(config[:dockerfile]))
         else
-          # TODO: Support other distribution
+          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'
+            file << 'RUN yum clean all'
+            file << 'RUN yum -y install sudo curl tar'
+          else
+            # TODO: Support other distribution
+          end
+          Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
+          file.join("\n")
         end
-        Array(config[:run_command]).each { |cmd| file << "RUN #{cmd}" }
-        file.join("\n")
       end
 
       def execute(cmd, opts = {})

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.3.1'
+    DOCKER_CLI_VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen