kitchen-docker 0.2.0 → 0.3.0

data/README.md

@@ -69,19 +69,19 @@ The default value is `true`.
 
 ### <a name="config-forward"></a> forward
 
-Suite container port(s) to forward to the host machine. You cannot
-specify the host port in the mappings, Docker does this for you.
+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:
 
 ```
-forward: 8080
+forward: 80
 ```
 
 ```
 forward:
-- 22
-- 80
+- 22:2222
+- 80:8080
 ```
 
 ## <a name="development"></a> Development

data/kitchen-docker.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha.3'
+  spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha.7'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/docker.rb

@@ -34,6 +34,7 @@ module Kitchen
       default_config :username,             'kitchen'
       default_config :password,             'kitchen'
       default_config :require_chef_omnibus, true
+      default_config :remove_images,        false
 
       def verify_dependencies
         run_command('docker > /dev/null', :quiet => true)
@@ -52,7 +53,9 @@ module Kitchen
 
       def destroy(state)
         rm_container(state) if state[:container_id]
-        rm_image(state) if state[:image_id]
+        if config[:remove_images] && state[:image_id]
+          rm_image(state)
+        end
       end
 
       protected

data/lib/kitchen/driver/docker_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "0.2.0"
+    DOCKER_VERSION = "0.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.3
+        version: 1.0.0.alpha.7
     none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.3
+        version: 1.0.0.alpha.7
     none: false
   prerelease: false
   name: test-kitchen
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 1909028313139145736
+      hash: 1226887042038828022
       version: '0'
       segments:
       - 0
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 1909028313139145736
+      hash: 1226887042038828022
       version: '0'
       segments:
       - 0