kitchen-docker 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b5e818b27e08a0bb66eb3112149baa24693cf64
-  data.tar.gz: c92c8f8040451353f0ae7adea878bcb7c53fde83
+  metadata.gz: 2739fe136af5fc12187dc12311614fc6ff543e5f
+  data.tar.gz: 8cf6f0f2da67f247289076f05e25030faa0ef616
 SHA512:
-  metadata.gz: 77259418eef3c8aad3f7d4d9644c55dd00ea219929143e9ac7435f16489784b071405a6edb7e9824622fb4804cf6b02fd99a5cebc162f0582faaee6c1dbde027
-  data.tar.gz: c24d8cbc1874ef7e1fbb7a7d8cc2e04817e60583ad07ab59b5952020866233a69cac81e5d64942ef461bdded29f7d6105c183ea82eeac6fa5f7c176e937c44a4
+  metadata.gz: 83cc959ba5834d55b19779a3c864a5682f63b010bf4d2aacb05ba465e997da4a2b43dccbb664ac47fef4e31dae5e3b8cc5f6867c9a882b5f9c630e57fd724b38
+  data.tar.gz: 87b9510146a4aaa80c79d942b4be82baff3fc93a0dac2d210098ff0cacbecc1fb883ab1400e909144bb898ba19c25071c4fa5e4266072e3e9473cfaa27842510

data/README.md

@@ -61,6 +61,24 @@ platforms:
 
 ## Configuration
 
+### socket
+
+The Docker daemon socket to use. By default, Docker it 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.
+
+Examples:
+
+```
+  socket: unix:///tmp/docker.sock
+```
+
+```
+  socket: tcp://docker.example.com:4242
+```
+
 ### image
 
 The Docker image to use as the base for the suite containers. You can find
@@ -146,13 +164,13 @@ Adds a data volume(s) to the suite container.
 Examples:
 
 ```
-volume: /ftp
+  volume: /ftp
 ```
 
 ```
-volume:
-- /ftp
-- /srv
+  volume:
+  - /ftp
+  - /srv
 ```
 
 ## dns
@@ -163,13 +181,13 @@ dockers defaults.
 Examples:
 
 ```
-dns: 8.8.8.8
+  dns: 8.8.8.8
 ```
 
 ```
-dns:
-- 8.8.8.8
-- 8.8.4.4
+  dns:
+  - 8.8.8.8
+  - 8.8.4.4
 ```
 
 ### forward
@@ -180,13 +198,13 @@ the host (public) port in the mappings, if not, Docker chooses for you.
 Examples:
 
 ```
-forward: 80
+  forward: 80
 ```
 
 ```
-forward:
-- 22:2222
-- 80:8080
+  forward:
+  - 22:2222
+  - 80:8080
 ```
 
 ## Development

data/lib/kitchen/driver/docker.rb

@@ -26,15 +26,16 @@ module Kitchen
     # @author Sean Porter <portertech@gmail.com>
     class Docker < Kitchen::Driver::SSHBase
 
-      default_config :port,                 '22'
       default_config :username,             'kitchen'
       default_config :password,             'kitchen'
       default_config :require_chef_omnibus, true
       default_config :remove_images,        false
       default_config :use_sudo,             true
+
       default_config :image do |driver|
         driver.default_image
       end
+
       default_config :platform do |driver|
         driver.default_platform
       end
@@ -58,8 +59,9 @@ module Kitchen
       def create(state)
         state[:image_id] = build_image(state) unless state[:image_id]
         state[:container_id] = run_container(state) unless state[:container_id]
-        state[:hostname] = container_address(state) unless state[:hostname]
-        wait_for_sshd(state[:hostname])
+        state[:hostname] = remote_socket? ? socket_uri.host : 'localhost'
+        state[:port] = container_ssh_port(state)
+        wait_for_sshd(state[:hostname], :port => state[:port])
       end
 
       def destroy(state)
@@ -71,6 +73,20 @@ module Kitchen
 
       protected
 
+      def socket_uri
+        URI.parse(config[:socket])
+      end
+
+      def remote_socket?
+        config[:socket] ? socket_uri.scheme == 'tcp' : false
+      end
+
+      def docker_command(cmd, options={})
+        docker = "docker"
+        docker << " -H #{config[:socket]}" if config[:socket]
+        run_command("#{docker} #{cmd}", options)
+      end
+
       def dockerfile
         from = "FROM #{config[:image]}"
         platform = case config[:platform]
@@ -119,13 +135,13 @@ module Kitchen
       end
 
       def build_image(state)
-        output = run_command("docker build -", :input => dockerfile)
+        output = docker_command("build -", :input => dockerfile)
         parse_image_id(output)
       end
 
       def parse_container_id(output)
         container_id = output.chomp
-        unless container_id.size == 12
+        unless [12, 64].include?(container_id.size)
           raise ActionFailed,
           'Could not parse Docker run output for container ID'
         end
@@ -133,7 +149,7 @@ module Kitchen
       end
 
       def build_run_command(image_id)
-        cmd = 'docker run -d'
+        cmd = "run -d -p 22"
         Array(config[:forward]).each {|port| cmd << " -p #{port}"}
         Array(config[:dns]).each {|dns| cmd << " -dns #{dns}"}
         Array(config[:volume]).each {|volume| cmd << " -v #{volume}"}
@@ -145,36 +161,37 @@ module Kitchen
 
       def run_container(state)
         cmd = build_run_command(state[:image_id])
-        output = run_command(cmd)
+        output = docker_command(cmd)
         parse_container_id(output)
       end
 
-      def parse_container_ip(output)
+      def parse_container_ssh_port(output)
         begin
           info = Array(::JSON.parse(output)).first
-          settings = info['NetworkSettings']
-          settings['IpAddress'] || settings['IPAddress']
+          ports = info['NetworkSettings']['Ports']
+          ssh_port = ports['22/tcp'].detect {|port| port['HostIp'] == '0.0.0.0'}
+          ssh_port['HostPort'].to_i
         rescue
           raise ActionFailed,
-          'Could not parse Docker inspect output for container IP address'
+          'Could not parse Docker inspect output for container SSH port'
         end
       end
 
-      def container_address(state)
+      def container_ssh_port(state)
         container_id = state[:container_id]
-        output = run_command("docker inspect #{container_id}")
-        parse_container_ip(output)
+        output = docker_command("inspect #{container_id}")
+        parse_container_ssh_port(output)
       end
 
       def rm_container(state)
         container_id = state[:container_id]
-        run_command("docker stop #{container_id}")
-        run_command("docker rm #{container_id}")
+        docker_command("stop #{container_id}")
+        docker_command("rm #{container_id}")
       end
 
       def rm_image(state)
         image_id = state[:image_id]
-        run_command("docker rmi #{image_id}")
+        docker_command("rmi #{image_id}")
       end
     end
   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.8.1"
+    DOCKER_VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -138,3 +138,4 @@ signing_key:
 specification_version: 4
 summary: A Test Kitchen Driver for Docker
 test_files: []
+has_rdoc: