kitchen-docker 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2739fe136af5fc12187dc12311614fc6ff543e5f
-  data.tar.gz: 8cf6f0f2da67f247289076f05e25030faa0ef616
+  metadata.gz: 8bd94e336b2efec8e0f305e3f8b95c65520187f4
+  data.tar.gz: cb4dc3cba3379999ab3a4dd1227107744f75a592
 SHA512:
-  metadata.gz: 83cc959ba5834d55b19779a3c864a5682f63b010bf4d2aacb05ba465e997da4a2b43dccbb664ac47fef4e31dae5e3b8cc5f6867c9a882b5f9c630e57fd724b38
-  data.tar.gz: 87b9510146a4aaa80c79d942b4be82baff3fc93a0dac2d210098ff0cacbecc1fb883ab1400e909144bb898ba19c25071c4fa5e4266072e3e9473cfaa27842510
+  metadata.gz: 966c5f71094442cb47883f6409ffa23b71afaee64b592f0af3057ebc9ec87ff85c5cecf6861212d858a2b985e82cb090000e315e66ab9c01bf795e82ff71c95d
+  data.tar.gz: 1ea742d4ecb65e10dd1ceeda80bf3f5d866e53220502778989b02227be561f034a322c702a590d2ee722299c10c118dba2fd25bfd5e8576cb4f4c3d30859dfc6

data/README.md

@@ -63,11 +63,11 @@ platforms:
 
 ### socket
 
-The Docker daemon socket to use. By default, Docker it will listen on
+The Docker daemon socket to use. By default, Docker will listen on
 `unix:///var/run/docker.sock`, and no configuration here is required. If
 Docker is binding to another host/port or Unix socket, you will need to set
 this option. If a TCP socket is set, its host will be used for SSH access
-to containers.
+to suite containers.
 
 Examples:
 
@@ -124,7 +124,7 @@ Custom command(s) to be run when provisioning the base for the suite containers.
 Examples:
 
 ```
-  provision_command: "curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+  provision_command: "curl -L https://www.opscode.com/chef/install.sh | bash"
 ```
 
 ```
@@ -135,7 +135,7 @@ Examples:
 
 ```
 driver_config:
-  provision_command: "curl -L https://www.opscode.com/chef/install.sh | sudo bash"
+  provision_command: "curl -L https://www.opscode.com/chef/install.sh | bash"
   require_chef_omnibus: false
 ```
 
@@ -148,14 +148,13 @@ The default value is `false`.
 
 ### memory
 
-Sets the memory limit for the container. The value must be set in bytes.
-If not, set it defaults to dockers default settings. You can read more about
-`memory.limit_in_bytes` [here][memory_limit_in_bytes].
+Sets the memory limit for the suite container in bytes. Otherwise use Dockers
+default. You can read more about `memory.limit_in_bytes` [here][memory_limit].
 
 ### cpu
 
-Sets the cpu shares (relative weight). If not set, it defaults to dockers
-default settings. You can read more about cpu.shares [here][cpu_shares].
+Sets the CPU shares (relative weight) for the suite container. Otherwise use
+Dockers defaults. You can read more about cpu.shares [here][cpu_shares].
 
 ### volume
 
@@ -176,7 +175,7 @@ Examples:
 ## dns
 
 Adjusts `resolv.conf` to use the dns servers specified. Otherwise use
-dockers defaults.
+Dockers defaults.
 
 Examples:
 
@@ -192,7 +191,7 @@ Examples:
 
 ### forward
 
-Suite container port(s) to forward to the host machine. You may specify
+Set suite container port(s) to forward to the host machine. You may specify
 the host (public) port in the mappings, if not, Docker chooses for you.
 
 Examples:
@@ -207,6 +206,29 @@ Examples:
   - 80:8080
 ```
 
+### hostname
+
+Set the suite container hostname. Otherwise use Dockers default.
+
+Examples:
+
+```
+  hostname: foobar.local
+```
+
+### privileged
+
+Run the suite container in privileged mode. This allows certain functionality
+inside the Docker container which is not otherwise permitted.
+
+The default value is `false`.
+
+Examples:
+
+```
+  privileged: true
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]
@@ -242,4 +264,4 @@ Apache 2.0 (see [LICENSE][license])
 [driver_usage]:           http://docs.kitchen-ci.org/drivers/usage
 [chef_omnibus_dl]:        http://www.opscode.com/chef/install/
 [cpu_shares]:             https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.html
-[memory_limit_in_bytes]:  https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-memory.html
+[memory_limit]:           https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-memory.html

data/lib/kitchen/driver/docker.rb

@@ -30,6 +30,7 @@ module Kitchen
       default_config :password,             'kitchen'
       default_config :require_chef_omnibus, true
       default_config :remove_images,        false
+      default_config :privileged,           false
       default_config :use_sudo,             true
 
       default_config :image do |driver|
@@ -153,8 +154,10 @@ module Kitchen
         Array(config[:forward]).each {|port| cmd << " -p #{port}"}
         Array(config[:dns]).each {|dns| cmd << " -dns #{dns}"}
         Array(config[:volume]).each {|volume| cmd << " -v #{volume}"}
+        cmd << " -h #{config[:hostname]}" if config[:hostname]
         cmd << " -m #{config[:memory]}" if config[:memory]
         cmd << " -c #{config[:cpu]}" if config[:cpu]
+        cmd << " -privileged" if config[:privileged]
         cmd << " #{image_id} /usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no"
         cmd
       end

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.9.0"
+    DOCKER_VERSION = "0.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen