kitchen-docker_cli 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66fe10a065fda5ba1aa5aba1c625d3eb18c2c059
-  data.tar.gz: f5f41b5f4d65e2eaf30aa852393e57c8dabc5dc9
+  metadata.gz: 59f4ff9d93ea123fbe449de146d4204624188a7f
+  data.tar.gz: 80110e3e1f6d1e62f70cec1c5636810ac1f2b2af
 SHA512:
-  metadata.gz: 2264085fe335a0fe2c448d5445b172e11c0256fadf970c38e316c1826dbef18c4860004dfefcb7c45cfec7debe78f5dd3134c545e2af69abc0604206f7d74df7
-  data.tar.gz: 6e65cb6fbdf7172524593bcb27f85ed87eab2f2d86e0043863278480da537b4cf3194bf292010c2309b131542e90aaabc2d59d8c794067340f51edd870b98ac9
+  metadata.gz: 8814b04067321e872576e35844a25c6f6bf0e1f86ba84e7f01e129e8a76da22f4953559925179a56facf0bbd960296b61b2fc8acc8bd33d982ef3b41e4c4c90c
+  data.tar.gz: 29d2f6b05daa100dbbd5a4366c415af25f09b4156552f108d07c550653350a1f4da5449bf5e29897205997041dcc7c1f32de457d2941fcccfd57198d67db4f2f

data/.kitchen.yml

@@ -15,6 +15,10 @@ suites:
   - name: chef
     provisioner:
       name: chef_zero
+    driver:
+      dns:
+        - 8.8.8.8
+        - 199.85.126.10
 
   - name: ansible
     provisioner:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.12.0
+
+* Add `dns` option
+
 ## 0.11.2
 
 * Bugfix [#16][]

data/README.md

@@ -192,6 +192,20 @@ Examples:
   instance_host_name: true
 ```
 
+### dns
+
+The IP addresses of your DNS servers.
+
+```yml
+  dns: 8.8.8.8
+```
+
+```yml
+  dns:
+    - 8.8.8.8
+    - 8.8.4.4
+```
+
 ### link
 
 Set `container_name`(and alias) of other container(s) that connect from the suite container.

data/lib/kitchen/driver/docker_cli.rb

@@ -106,6 +106,7 @@ module Kitchen
         Array(config[:volumes_from]).each { |vf| cmd << " --volumes-from #{vf}" }
         Array(config[:link]).each { |link| cmd << " --link #{link}" }
         Array(config[:expose]).each { |exp| cmd << " --expose #{exp}" }
+        Array(config[:dns]).each {|dns| cmd << " --dns #{dns}"}
         cmd << " #{image} #{config[:command]}"
       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.11.2'
+    DOCKER_CLI_VERSION = '0.12.0'
   end
 end

data/spec/kitchen/driver/docker_cli_spec.rb

@@ -125,12 +125,13 @@ describe Kitchen::Driver::DockerCli, "docker_run_command" do
         :cpu_shares => 512,
         :network => 'none',
         :hostname => 'example.local',
-        :instance_host_name => true
+        :instance_host_name => true,
+        :dns => ['8.8.8.8', '8.8.4.4']
       }
     end
 
     example do
-      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --volumes-from data --link mysql:db --expose 80 test /bin/bash"
+      cmd = "run -d -t --name web -P -m 256m -c 512 --privileged --net none -h example.local -p 80:8080 -p 22:2222 -v /dev:/dev --volumes-from data --link mysql:db --expose 80 --dns 8.8.8.8 --dns 8.8.4.4 test /bin/bash"
       expect(@docker_cli.docker_run_command('test')).to eq cmd
     end
   end

data/test/integration/chef/serverspec/dns_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe file('/etc/resolv.conf') do
+  ['8.8.8.8', '199.85.126.10'].each do |h|
+    its(:content) { should contain h }
+  end
+end

data/test/integration/chef/serverspec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'serverspec'
+
+set :backend, :exec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker_cli
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Masashi Terui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -129,6 +129,8 @@ files:
 - spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb
 - test/integration/ansible/default.yml
+- test/integration/chef/serverspec/dns_spec.rb
+- test/integration/chef/serverspec/spec_helper.rb
 homepage: https://github.com/marcy-terui/kitchen-docker_cli
 licenses:
 - Apache 2.0
@@ -159,3 +161,5 @@ test_files:
 - spec/kitchen/driver/dockerfile_nil.erb
 - spec/spec_helper.rb
 - test/integration/ansible/default.yml
+- test/integration/chef/serverspec/dns_spec.rb
+- test/integration/chef/serverspec/spec_helper.rb