kitchen-docker_cli 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf34c6963a7146a8e728654cf0b4d83553353584
-  data.tar.gz: a970a92c7193edbcd6fb4745bd00ee1ef8618cd6
+  metadata.gz: c1aebbb2fe16364552a69eaac3fd4241ebea7339
+  data.tar.gz: d0598beca61df19715ba59d7aa9616cf379340ac
 SHA512:
-  metadata.gz: 88dbfa9c5f743e6c7befb74e8df1c940a246fe76df450d82d169fd6d23c4914157cc8b65d5c3843b6aecee8730c273658967840fed9a147567ba276ae996ea0b
-  data.tar.gz: e3ede63db8cd4b92d69da5957e2e35193e75d796890dfe9b37ec1edcce859c1cc2d15bf0c81d0f2bb5592dbf70b759ecf94b1a1787e5096bc193082a5bcacbff
+  metadata.gz: cf2689759559525535b995598d63cbb56ecedb2f798bf7a74fb795f47aa53dc74d884bc04b6c1bd2015c24eee6d08dbe6a05b3d66f6c10d70f2eb4c4552631ca
+  data.tar.gz: 3603decf5026b403fe1e7dfacdadfefdceffffda1027c0914f3abfdc7f9cb3c8b73e22ac7a1ffd91e8ee5581272320d610edc3271889991467579728f838edfd

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 
 rvm:
-- 2.1
+- 2.2.3
+- 2.1.7
 - 2.0.0
 - 1.9.3
 - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.14.1
+
+* Pull request [#23][]: Add `build_context` option to pass Docker build context ([@nrvale0][])
+
 ## 0.14.0
 
 * Pull request [#21][]: Support `--add-host` option ([@sawanoboly][])
@@ -101,7 +105,9 @@
 [#17]: https://github.com/marcy-terui/kitchen-docker_cli/issues/17
 [#18]: https://github.com/marcy-terui/kitchen-docker_cli/issues/18
 [#21]: https://github.com/marcy-terui/kitchen-docker_cli/issues/21
+[#23]: https://github.com/marcy-terui/kitchen-docker_cli/issues/23
 [@grubernaut]: https://github.com/grubernaut
 [@hd-deman]: https://github.com/hd-deman
+[@nrvale0]: https://github.com/nrvale0
 [@sawanoboly]: https://github.com/sawanoboly
-[@yewton]: https://github.com/yewton
+[@yewton]: https://github.com/yewton

data/README.md

@@ -125,6 +125,10 @@ environment:
   LANG: ja_JP.UTF-8
 ```
 
+### build_context
+
+Pass the basedir as the Docker build context: 'docker build <options> .' Default is 'false'.
+
 ### no_cache
 
 Not use the cached image on `docker build`.
@@ -268,9 +272,25 @@ Examples:
 ```
 
 ```yml
-expose:
-  - 80
-  - 22
+  expose:
+    - 80
+    - 22
+```
+
+### add_host
+
+Add additional lines to `/etc/hosts`.
+
+Examples:
+
+```yml
+  add_host: myhost:127.0.0.1
+```
+
+```yml
+  add_host:
+    - myhost:127.0.0.1
+    - yourhost:123.123.123.123
 ```
 
 ### volume

data/lib/kitchen/driver/docker_cli.rb

@@ -29,6 +29,7 @@ module Kitchen
     class DockerCli < Kitchen::Driver::Base
 
       default_config :no_cache, false
+      default_config :build_context, false
       default_config :command, 'sh -c \'while true; do sleep 1d; done;\''
       default_config :privileged, false
       default_config :instance_host_name, false
@@ -85,7 +86,11 @@ module Kitchen
       def docker_build_command
         cmd = String.new('build')
         cmd << ' --no-cache' if config[:no_cache]
-        cmd << ' -'
+        if config[:build_context]
+          cmd << ' .'
+        else
+          cmd << ' -'
+        end
       end
 
       def docker_run_command(image)

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.0'
+    DOCKER_CLI_VERSION = '0.14.1'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -74,6 +74,14 @@ describe Kitchen::Driver::DockerCli, "docker_build_command" do
     @docker_cli = Kitchen::Driver::DockerCli.new(config)
   end
 
+  context 'build_context' do
+    let(:config)	{ {:build_context => true} }
+    
+    example do
+      expect(@docker_cli.docker_build_command).to eq 'build .'
+    end
+  end
+
   context 'default' do
     let(:config)       { {:no_cache => true} }
 
@@ -89,6 +97,7 @@ describe Kitchen::Driver::DockerCli, "docker_build_command" do
       expect(@docker_cli.docker_build_command).to eq 'build -'
     end
   end
+
 end
 
 describe Kitchen::Driver::DockerCli, "docker_run_command" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen