kitchen-docker 0.1.2 → 0.1.3

data/README.md

@@ -6,6 +6,10 @@ A Test Kitchen Driver for Docker.
 
 * [Docker][docker_getting_started]
 
+## <a name="issues"></a> Known Issues
+
+* Upstart is neutered due to [this issue][docker_upstart_issue].
+
 ## <a name="installation"></a> Installation and Setup
 
 Please read the [Driver usage][driver_usage] page for more details.
@@ -17,7 +21,7 @@ Please read the [Driver usage][driver_usage] page for more details.
 The Docker image to use as the base for the suite containers. You can find
 images using the [Docker Index][docker_index].
 
-The default value is `ubuntu` ([image][docker_default_image]).
+The default value is `base`, an official Ubuntu [image][docker_default_image].
 
 ### <a name="config-platform"></a> platform
 
@@ -74,7 +78,8 @@ Apache 2.0 (see [LICENSE][license])
 [license]:                https://github.com/portertech/kitchen-docker/blob/master/LICENSE
 [repo]:                   https://github.com/portertech/kitchen-docker
 [docker_getting_started]: http://www.docker.io/gettingstarted/
+[docker_upstart_issue]:   https://github.com/dotcloud/docker/issues/223
 [docker_index]:           https://index.docker.io/
-[docker_default_image]:   https://index.docker.io/_/ubuntu/
+[docker_default_image]:   https://index.docker.io/_/base/
 [driver_usage]:           http://docs.kitchen-ci.org/drivers/usage
 [chef_omnibus_dl]:        http://www.opscode.com/chef/install/

data/lib/kitchen/driver/docker.rb

@@ -28,7 +28,7 @@ module Kitchen
     # @author Sean Porter <portertech@gmail.com>
     class Docker < Kitchen::Driver::SSHBase
 
-      default_config :image,                'ubuntu'
+      default_config :image,                'base'
       default_config :platform,             'ubuntu'
       default_config :port,                 '22'
       default_config :username,             'kitchen'
@@ -51,7 +51,7 @@ module Kitchen
       end
 
       def destroy(state)
-        kill_container(state) if state[:container_id]
+        rm_container(state) if state[:container_id]
         rm_image(state) if state[:image_id]
       end
 
@@ -115,7 +115,11 @@ module Kitchen
 
       def run_container(state)
         image_id = state[:image_id]
-        cmd = "docker run -d #{image_id} /usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no"
+        cmd = "docker run -d"
+        Array(config[:forward]).each do |port|
+          cmd << " -p #{port}"
+        end
+        cmd << " #{image_id} /usr/sbin/sshd -D -o UseDNS=no -o UsePAM=no"
         output = run_command(cmd)
         parse_container_id(output)
       end
@@ -141,9 +145,9 @@ module Kitchen
         ssh(ssh_args, 'echo "127.0.0.1 `hostname`" | sudo tee -a /etc/hosts')
       end
 
-      def kill_container(state)
+      def rm_container(state)
         container_id = state[:container_id]
-        run_command("docker kill #{container_id}")
+        run_command("docker rm #{container_id}")
       end
 
       def rm_image(state)

data/lib/kitchen/driver/docker_version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 977071307405560001
+      hash: -3577795496291438005
       version: '0'
       segments:
       - 0
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 977071307405560001
+      hash: -3577795496291438005
       version: '0'
       segments:
       - 0