kitchen-dokken 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f110f9d52d458fff35dd7f3d0c515ca5b3128fa7
-  data.tar.gz: 67fbebd7410fffc444180312308cda484f027512
+  metadata.gz: 707daf8c414917ae605188884d923058053f9f4b
+  data.tar.gz: ea40c4ea169ff72a5bcf34f067e52d3a4df32728
 SHA512:
-  metadata.gz: 59c1c136f059c9cd39fe37a56e4773fb2b1f9978f0aed49db075c2431383d847ec6c1ddec8d77a00af4d9c1d8eb2c5bd97778d3dcdee6acc6e4c941c4817e575
-  data.tar.gz: a113e255970de1a1f4d0bf0a182e7c90652d1737bfb35d4446d9ae00a7220c2e4039e50ce42180c339bb91ecba732b4d198d719663b9a2128779038aba175922
+  metadata.gz: d486fddd26b5ffc192155f8b5202992fd2b7b39c3a4fcc4cfa5d5dd76d02ad61d969a38c59446f217cc33fe8948ee9c07b687639b6553e452b1ee68751fa6c82
+  data.tar.gz: 3c967d89c1e5b4829bf3d46e3e649cdce5be514e373b5522e8518cc8ef556cf8ad0aabb4f46be3345fb2d45dee01fdb1c1007a8599253f5025176346357370b9

data/lib/kitchen/driver/dokken.rb

@@ -37,7 +37,7 @@ module Kitchen
       default_config :chef_image, 'chef/chef'
       default_config :chef_version, 'latest'
       default_config :data_image, 'someara/kitchen-cache:latest'
-      default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
+      default_config :docker_host_url, default_docker_host
       default_config :dns, nil
       default_config :dns_search, nil
       default_config :read_timeout, 3600
@@ -99,8 +99,8 @@ module Kitchen
       end
 
       def delete_work_image
-        return unless ::Docker::Image.exist?(work_image, docker_connection)
-        with_retries { @work_image = ::Docker::Image.get(work_image, docker_connection) }
+        return unless ::Docker::Image.exist?(work_image, {}, docker_connection)
+        with_retries { @work_image = ::Docker::Image.get(work_image, {}, docker_connection) }
 
         begin
           with_retries { @work_image.remove(force: true) }
@@ -112,28 +112,24 @@ module Kitchen
       def build_work_image(state)
         # require 'pry' ; binding.pry
 
-        return if ::Docker::Image.exist?(work_image, docker_connection)
-
-        Dir.mktmpdir do |context_root|
-          File.write("#{context_root}/Dockerfile", work_image_dockerfile)
-          begin
-            with_retries do
-              @intermediate_image = ::Docker::Image.build_from_dir(
-                context_root,
-                {
-                  # 'nocache' => true,
-                  # 'forcerm' => true,
-                  # 'q' => true,
-                  't' => work_image
-                },
-                docker_connection
-              )
-            end
-          rescue Exception => e
-            raise "work_image build failed: #{e}"
-          end
-          state[:work_image] = work_image
+        return if ::Docker::Image.exist?(work_image, {}, docker_connection)
+
+        begin
+          @intermediate_image = ::Docker::Image.build(
+            work_image_dockerfile,
+            {
+              # 'nocache' => true,
+              # 'forcerm' => true,
+              # 'q' => true,
+              't' => work_image
+            },
+            docker_connection
+          )
+        rescue Exception => e
+          raise "work_image build failed: #{e}"
         end
+
+        state[:work_image] = work_image
       end
 
       def work_image_dockerfile
@@ -223,8 +219,10 @@ module Kitchen
         data_container = run_container(
           'name' => data_container_name,
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
-          'PortBindings' => port_forwards({}, '22'),
-          'PublishAllPorts' => true
+          'HostConfig' => {
+            'PortBindings' => port_forwards({}, '22'),
+            'PublishAllPorts' => true
+          }
         )
         # require 'pry' ; binding.pry
         state[:data_container] = data_container.json
@@ -239,7 +237,7 @@ module Kitchen
       end
 
       def create_chef_container(state)
-        c = ::Docker::Container.get(chef_container_name)
+        c = ::Docker::Container.get(chef_container_name, {}, docker_connection)
       rescue ::Docker::Error::NotFoundError
         begin
           debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
@@ -265,14 +263,14 @@ module Kitchen
       end
 
       def delete_image(name)
-        with_retries { @image = ::Docker::Image.get(name, docker_connection) }
+        with_retries { @image = ::Docker::Image.get(name, {}, docker_connection) }
         with_retries { @image.remove(force: true) }
       rescue ::Docker::Error => e
         puts "Image #{name} not found. Nothing to delete."
       end
 
       def container_exist?(name)
-        return true if ::Docker::Container.get(name)
+        return true if ::Docker::Container.get(name, {}, docker_connection)
       rescue
         false
       end
@@ -284,17 +282,17 @@ module Kitchen
       def create_container(args)
         with_retries do
           @container = ::Docker::Container.create(args.clone, docker_connection)
-          @container = ::Docker::Container.get(args['name'])
+          @container = ::Docker::Container.get(args['name'], {}, docker_connection)
         end
       rescue ::Docker::Error::ConflictError
-        with_retries { @container = ::Docker::Container.get(args['name']) }
+        with_retries { @container = ::Docker::Container.get(args['name'], {}, docker_connection) }
       end
 
       def run_container(args)
         create_container(args)
         with_retries do
           @container.start
-          @container = ::Docker::Container.get(args['name'])
+          @container = ::Docker::Container.get(args['name'], {}, docker_connection)
           wait_running_state(args['name'], true)
         end
         @container
@@ -305,7 +303,7 @@ module Kitchen
       end
 
       def stop_container(name)
-        with_retries { @container = ::Docker::Container.get(name, docker_connection) }
+        with_retries { @container = ::Docker::Container.get(name, {}, docker_connection) }
         with_retries do
           @container.stop(force: true)
           wait_running_state(name, false)
@@ -315,21 +313,21 @@ module Kitchen
       end
 
       def delete_container(name)
-        with_retries { @container = ::Docker::Container.get(name, docker_connection) }
+        with_retries { @container = ::Docker::Container.get(name, {}, docker_connection) }
         with_retries { @container.delete(force: true, v: true) }
       rescue ::Docker::Error::NotFoundError
         debug "Container #{name} not found. Nothing to delete."
       end
 
       def wait_running_state(name, v)
-        @container = ::Docker::Container.get(name)
+        @container = ::Docker::Container.get(name, {}, docker_connection)
         i = 0
         tries = 20
         until container_state['Running'] == v || container_state['FinishedAt'] != '0001-01-01T00:00:00Z'
           i += 1
           break if i == tries
           sleep 0.1
-          @container = ::Docker::Container.get(name)
+          @container = ::Docker::Container.get(name, {}, docker_connection)
         end
       end
 
@@ -380,13 +378,13 @@ module Kitchen
       end
 
       def pull_if_missing(image)
-        return if ::Docker::Image.exist?("#{repo(image)}:#{tag(image)}", docker_connection)
+        return if ::Docker::Image.exist?("#{repo(image)}:#{tag(image)}", {}, docker_connection)
         pull_image image
       end
 
       def pull_image(image)
         with_retries do
-          ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
+          ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, nil, docker_connection)
         end
       end
 

data/lib/kitchen/driver/dokken/helpers.rb

@@ -57,6 +57,19 @@ EOF
         i = ::Docker::Image.build_from_dir("#{tmpdir}/dokken", 'nocache' => true, 'rm' => true)
         i.tag('repo' => repo(data_image), 'tag' => tag(data_image), 'force' => true)
       end
+
+      def default_docker_host
+        if ENV['DOCKER_HOST']
+          ENV['DOCKER_HOST']
+        elsif File.exist?('/var/run/docker.sock')
+          'unix:///var/run/docker.sock'
+        # TODO: Docker for Windows also operates over a named pipe at
+        # //./pipe/docker_engine that can be used if named pipe support is
+        # added to the docker-api gem.
+        else
+          'tcp://127.0.0.1:2375'
+        end
+      end
     end
   end
 end

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '1.0.10'.freeze
+    DOKKEN_VERSION = '1.1.0'.freeze
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'kitchen'
+require 'net/scp'
 require 'tmpdir'
 require 'digest/sha1'
 require_relative 'dokken/helpers'
@@ -38,11 +39,11 @@ module Kitchen
 
       plugin_version Kitchen::VERSION
 
-      default_config :docker_host_url, ENV['DOCKER_HOST'] || 'unix:///var/run/docker.sock'
+      default_config :docker_host_url, default_docker_host
       default_config :read_timeout, 3600
       default_config :write_timeout, 3600
       default_config :host_ip_override do |transport|
-        transport.docker_for_mac? ? "localhost" : false
+        transport.docker_for_mac_or_win? ? "localhost" : false
       end
 
       # (see Base#connection)
@@ -110,20 +111,32 @@ module Kitchen
           File.write("#{tmpdir}/dokken/id_rsa", insecure_ssh_private_key)
           FileUtils.chmod(0600, "#{tmpdir}/dokken/id_rsa")
 
-          rsync_cmd = '/usr/bin/rsync -a -e'
-          rsync_cmd << ' \''
-          rsync_cmd << 'ssh -2'
-          rsync_cmd << " -i #{tmpdir}/dokken/id_rsa"
-          rsync_cmd << ' -o CheckHostIP=no'
-          rsync_cmd << ' -o Compression=no'
-          rsync_cmd << ' -o PasswordAuthentication=no'
-          rsync_cmd << ' -o StrictHostKeyChecking=no'
-          rsync_cmd << ' -o UserKnownHostsFile=/dev/null'
-          rsync_cmd << ' -o LogLevel=ERROR'
-          rsync_cmd << " -p #{port}"
-          rsync_cmd << '\''
-          rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
-          system(rsync_cmd)
+          begin
+            rsync_cmd = '/usr/bin/rsync -a -e'
+            rsync_cmd << ' \''
+            rsync_cmd << 'ssh -2'
+            rsync_cmd << " -i #{tmpdir}/dokken/id_rsa"
+            rsync_cmd << ' -o CheckHostIP=no'
+            rsync_cmd << ' -o Compression=no'
+            rsync_cmd << ' -o PasswordAuthentication=no'
+            rsync_cmd << ' -o StrictHostKeyChecking=no'
+            rsync_cmd << ' -o UserKnownHostsFile=/dev/null'
+            rsync_cmd << ' -o LogLevel=ERROR'
+            rsync_cmd << " -p #{port}"
+            rsync_cmd << '\''
+            rsync_cmd << " #{locals.join(' ')} root@#{ip}:#{remote}"
+            %x(#{rsync_cmd})
+          rescue Errno::ENOENT
+            debug 'Rsync is not installed. Falling back to SCP.'
+            locals.each do |local|
+              Net::SCP.upload!(ip,
+                               'root',
+                               local,
+                               remote,
+                               recursive: true,
+                               ssh: { port: port, keys: ["#{tmpdir}/dokken/id_rsa"] })
+            end
+          end
         end
 
         def login_command
@@ -163,11 +176,11 @@ module Kitchen
         end
       end
 
-      # Detect whether or not we are running in Docker for Mac
+      # Detect whether or not we are running in Docker for Mac or Windows
       #
       # @return [TrueClass,FalseClass]
-      def docker_for_mac?
-        Docker.info["Name"] == "moby"
+      def docker_for_mac_or_win?
+        ::Docker.info(::Docker::Connection.new(config[:docker_host_url], {}))['Name'] == "moby"
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen