Boot2docker

README.md

@@ -36,6 +36,9 @@ knife-docker bootstraps your Docker containers via SSH. Thus, you need to use a
       # Create and bootstrap a Debian container over ssh
       $ knife docker create -I knife-docker-debian
 
+      # If using boot2docker (i.e. running docker + knife under os x)
+      $ knife docker create -I knife-docker-debian -b
+
       # Create a Debian container, bootstrap it, and apply the specified roles/recipes
       $ knife docker create -I knife-docker-debian -r 'recipe[postgresql::server]'
 

lib/chef/knife/docker_create.rb

@@ -26,7 +26,7 @@ class DockerCreate < Chef::Knife
     end
 
     banner "knife docker create (options)"
-    
+
     option :_image,
       :short => "-I IMAGE",
       :long => "--image IMAGE",
@@ -78,6 +78,13 @@ class DockerCreate < Chef::Knife
       :long => "--identity IDENTITY_FILE",
       :description => "SSH identity file for authentication"
 
+    option :boot2docker,
+      :short => "-b",
+      :long => "--boot2docker",
+      :boolean => true,
+      :default => false,
+      :description => "Set if using boot2docker"
+
     def locate_config_value(key)
       key = key.to_sym
       config[key] || Chef::Config[:knife][key]
@@ -98,9 +105,17 @@ def run
         exit 1
       end
 
-      # get container IP
-      container_info = `docker inspect #{id}`
-      ip = container_info.match(/"IPAddress": "([\d\.]+)"/)[1]
+      # if using boot2docker, get server ip and forwarded container ssh port
+      if config[:boot2docker]
+        boot2docker_ip = `boot2docker ip 2>/dev/null`
+        ip = boot2docker_ip.match(/([\d\.]+)/)[1]
+        container_info = `docker inspect #{id}`
+        config[:ssh_port] = container_info.match(/"HostPort": "(\d+)"/)[1]
+      else
+        # get container IP
+        container_info = `docker inspect #{id}`
+        ip = container_info.match(/"IPAddress": "([\d\.]+)"/)[1]
+      end
 
       # containers boot *very* fast, but it might happen that we try to
       # bootstrap before SSH is up. Let's wait a second.

lib/knife-docker/version.rb

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