knife-docker 0.0.1 → 0.0.2

data/README.md

@@ -16,9 +16,18 @@ This plugin is distributed as a Ruby Gem. To install it, run:
 Depending on your system's configuration, you may need to run this command
 with root/administrator privileges.
 
-Make sure you are able to create/list/stop Docker containers. Please see 
+## Prerequisites
+You need to be able to create/list/stop Docker containers. Please see 
 [the Docker documentation] (https://www.docker.io/gettingstarted/) for more information. 
 
+knife-docker bootstraps your Docker containers via ssh. Make sure the Docker
+image you are using has the ssh daemon installed, and that you are able to
+login:
+      
+    id=$(docker run -d -p 22 $IMAGE /usr/sbin/sshd -D)
+    port=$(docker port $id 22)
+    ssh root@localhost -p $port
+
 ## Examples
       # Create and bootstrap a Debian container over ssh
       $ knife docker create -I emarocca/wheezy

data/lib/chef/knife/docker_create.rb

@@ -100,7 +100,7 @@ module ChefDocker
 
       # get container IP
       container_info = `docker inspect #{id}`
-      ip = container_info.match(/"IPAddress": "(?<ip>[\d\.]+)"/)['ip']
+      ip = container_info.match(/"IPAddress": "([\d\.]+)"/)[1]
 
       # containers boot *very* fast, but it might happen that we try to
       # bootstrap before SSH is up. Let's wait a second.

data/lib/chef/knife/docker_delete.rb

@@ -41,9 +41,8 @@ module ChefDocker
       running_containers = []
 
       `docker ps`.split(/\n/).each do |c|
-        match = c.match(/^(?<id>[\d\w]{12})\s/)
-        if match
-          running_containers.push match['id']
+        if c =~ /^[\d\w]{12}\s/
+          running_containers.push c.split[0]
         end
       end
 

data/lib/knife-docker/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Docker
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-docker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef