kitchen-dokken 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b94927d0fdf403e0ef7a8d29c822c1bc40e665e5
-  data.tar.gz: 1b677d8ddefd5a5f00e68d3cc23ceac0481861f3
+  metadata.gz: 9494b26b4a405a8f38a883a42a7340e6f8be4575
+  data.tar.gz: 5ce379b166ddb53aa4cb15548cb8a607a90e8a43
 SHA512:
-  metadata.gz: af2a29c3d364fa2f381b9e7939fb5ae1fcfc0f1f2e02e6dd2fdb1768545c3db79e1d86c879f57ef4efb7e92abf6b401d0cbfb7748356b302a8e1815d677c6c24
-  data.tar.gz: ae7cb20ca402a128fdce3f1b37662b8339bc5b6d2a3f5de23418ec4759fa985b385f95e42481a608144f0e2bcc6bfc65009300d417aa316a7a10be428ceccc91
+  metadata.gz: 7f6677da46ac67196299b8a4b06e42ac4f8aef0a625d4d6fc153d8b2e3eaf04eac79ff9d36f42886eebe489f0fa90f61441c2f2f28f65253792e85ff7282caf6
+  data.tar.gz: 7f1197d71a32309814433ce1d611048e506b1055db5774c3ff07a2622fdd7282c6e0f552c5cfb7f694dd88b0a5d46a088f9e8631395e9b2beed5cdb64f5fe4f3

data/lib/kitchen/driver/dokken.rb

@@ -79,29 +79,29 @@ module Kitchen
       end
 
       def docker_connection
-        opts = Docker.options
+        opts = ::Docker.options
         opts[:read_timeout] = config[:read_timeout]
         opts[:write_timeout] = config[:write_timeout]
-        @docker_connection ||= Docker::Connection.new(config[:docker_host_url], opts)
+        @docker_connection ||= ::Docker::Connection.new(config[:docker_host_url], opts)
       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) }
         with_retries { @work_image.remove(force: true) }
       end
 
       def build_work_image(state)
         # require 'pry' ; binding.pry
         
-        return if Docker::Image.exist?(work_image, docker_connection)
+        return if ::Docker::Image.exist?(work_image, docker_connection)
 
         FileUtils.mkdir_p context_root
         File.write("#{context_root}/Dockerfile", work_image_dockerfile)
 
         begin
           with_retries do
-            @intermediate_image = Docker::Image.build_from_dir(
+            @intermediate_image = ::Docker::Image.build_from_dir(
               context_root,
               {
                 # 'nocache' => true,
@@ -112,8 +112,8 @@ module Kitchen
               docker_connection
             )
           end
-        rescue
-          fail 'work_image build failed'
+        rescue Exception => e
+          fail  "work_image build failed: #{e}" 
         end
         state[:work_image] = work_image
       end
@@ -218,8 +218,8 @@ module Kitchen
       end
 
       def create_chef_container(state)
-        c = Docker::Container.get(chef_container_name)
-      rescue Docker::Error::NotFoundError
+        c = ::Docker::Container.get(chef_container_name)
+      rescue ::Docker::Error::NotFoundError
         begin
           debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
           chef_container = create_container(
@@ -244,14 +244,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
+      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)
       rescue
         false
       end
@@ -262,18 +262,18 @@ 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.create(args.clone, docker_connection)
+          @container = ::Docker::Container.get(args['name'])
         end
-      rescue Docker::Error::ConflictError
-        with_retries { @container = Docker::Container.get(args['name']) }
+      rescue ::Docker::Error::ConflictError
+        with_retries { @container = ::Docker::Container.get(args['name']) }
       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'])
           wait_running_state(args['name'], true)
         end
         @container
@@ -285,34 +285,34 @@ module Kitchen
 
       def stop_container(name)
         begin
-          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)
           end
-        rescue Docker::Error::NotFoundError
+        rescue ::Docker::Error::NotFoundError
           debug "Container #{name} not found. Nothing to stop."
         end
       end
 
       def delete_container(name)
         begin
-          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
+        rescue ::Docker::Error::NotFoundError
           debug "Container #{name} not found. Nothing to delete."
         end
       end
 
       def wait_running_state(name, v)
-        @container = Docker::Container.get(name)
+        @container = ::Docker::Container.get(name)
         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)
         end
       end
 
@@ -345,13 +345,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 {
-          Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
+          ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
         }
       end
 
@@ -364,10 +364,10 @@ module Kitchen
         begin
           block.call
           # Only catch errors that can be fixed with retries.
-        rescue Docker::Error::ServerError, # 404
-               Docker::Error::UnexpectedResponseError, # 400
-               Docker::Error::TimeoutError,
-               Docker::Error::IOError => e
+        rescue ::Docker::Error::ServerError, # 404
+               ::Docker::Error::UnexpectedResponseError, # 400
+               ::Docker::Error::TimeoutError,
+               ::Docker::Error::IOError => e
           tries -= 1
           retry if tries > 0
           raise e

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

@@ -47,14 +47,14 @@ EOF
       end
 
       def create_data_image
-        return if Docker::Image.exist?(data_image)
+        return if ::Docker::Image.exist?(data_image)
 
         tmpdir = Dir.tmpdir
         FileUtils.mkdir_p "#{tmpdir}/dokken"
         File.write("#{tmpdir}/dokken/Dockerfile", data_dockerfile)
         File.write("#{tmpdir}/dokken/authorized_keys", insecure_ssh_public_key)
 
-        i = Docker::Image.build_from_dir("#{tmpdir}/dokken", { 'nocache' => true, 'rm' => true })
+        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
     end

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '0.0.29'
+    DOKKEN_VERSION = '0.0.30'
   end
 end

data/lib/kitchen/transport/dokken.rb

@@ -56,13 +56,13 @@ module Kitchen
       # @author Sean OMeara <sean@chef.io>
       class Connection < Kitchen::Transport::Dokken::Connection
         def docker_connection
-          @docker_connection ||= Docker::Connection.new(options[:docker_host_url], options[:docker_host_options])
+          @docker_connection ||= ::Docker::Connection.new(options[:docker_host_url], options[:docker_host_options])
         end
 
         def execute(command)
           return if command.nil?
 
-          with_retries { @runner = Docker::Container.get(instance_name, {}, docker_connection) }
+          with_retries { @runner = ::Docker::Container.get(instance_name, {}, docker_connection) }
           with_retries do
             o = @runner.exec(Shellwords.shellwords(command)) { |_stream, chunk| print "#{chunk}" }
             @exit_code = o[2]
@@ -76,7 +76,7 @@ module Kitchen
           # Disabling this for now.. the Docker ZFS driver won't let us
           # commit running containers.
           #
-          # with_retries { @old_image = Docker::Image.get(work_image, {}, docker_connection) }
+          # with_retries { @old_image = ::Docker::Image.get(work_image, {}, docker_connection) }
           # with_retries { @new_image = @runner.commit }
           # with_retries { @new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true') }
           # with_retries { @old_image.remove }
@@ -84,7 +84,8 @@ module Kitchen
 
         def upload(locals, remote)
           if options[:docker_host_url] =~ /unix:/
-            ip = '127.0.0.1'
+            # we should read the proper mapped ip, since this allows us to upload the files
+            ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
           elsif options[:docker_host_url] =~ /tcp:/
             ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
           else
@@ -140,10 +141,10 @@ module Kitchen
           begin
             block.call
             # Only catch errors that can be fixed with retries.
-          rescue Docker::Error::ServerError, # 404
-                 Docker::Error::UnexpectedResponseError, # 400
-                 Docker::Error::TimeoutError,
-                 Docker::Error::IOError => e
+          rescue ::Docker::Error::ServerError, # 404
+                 ::Docker::Error::UnexpectedResponseError, # 400
+                 ::Docker::Error::TimeoutError,
+                 ::Docker::Error::IOError => e
             tries -= 1
             retry if tries > 0
             raise e
@@ -162,7 +163,7 @@ module Kitchen
       def connection_options(data) # rubocop:disable Metrics/MethodLength
         opts = {}
         opts[:docker_host_url] = config[:docker_host_url]
-        opts[:docker_host_options] = Docker.options
+        opts[:docker_host_options] = ::Docker.options
         opts[:data_container] = data[:data_container]
         opts[:instance_name] = data[:instance_name]
         opts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.2
+        version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.26.2
+        version: '1.28'
 description: A Test Kitchen Driver for Dokken
 email:
 - sean@chef.io
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes