kitchen-dokken 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98524d476ee9044dfb093ab3de13152ac564103fa663d8d50bdf0393d9bfcf32
-  data.tar.gz: 653e8898c6d4cc114edc2dd4d1229744d0fea01745c4a45dfac1e49ada5127e5
+  metadata.gz: ef0d3aea1c2839a2674ed7986dba589c8e672a19a600bdf9173689d286414160
+  data.tar.gz: ad29a7651abca534ff753140b67408adfa5e7a8c44252b810925a68f1ac2ca88
 SHA512:
-  metadata.gz: 751bf6a56a04c4eaa040cdc0a527d9a0b9202534107d16563af52986b57285337be29cb89203828135f2bf373afad8e4413580a837398e0964c89eff9c6defed
-  data.tar.gz: 3828997c2805eb7b2f1d433643c32ceef797a82a1a7d20649c6309c8cc760c965a4bc8c9222fc8fa5956c84657b53040cd26ed86bfdd065303dcdd4d3aa0bcb2
+  metadata.gz: e5056e47e61cd05b666a4058a0eaee09a4fa4907d331088f92ff783c41bd455cc33424ca25ac885b278270c4f8d8ebdc80cf5734d3b7363da6c4d34e1f2e74de
+  data.tar.gz: 50bec0744f44a44603dc887c99b3c73009eebe9c02f2832c10aecfa02bc46cea55c19d591d3d08efc409907a80139626bbf356aafbf73017872e607d65c857c9

data/lib/kitchen/driver/dokken.rb

@@ -153,9 +153,9 @@ module Kitchen
         rescue Docker::Error::UnexpectedResponseError => e
           msg = 'work_image build failed: '
           msg += JSON.parse(e.to_s.split("\r\n").last)['error'].to_s
-          msg += '. The common scenerios are incorrect intermediate'
+          msg += '. The common scenarios are incorrect intermediate '
           msg += 'instructions such as not including `-y` on an `apt-get` '
-          msg += 'or similar. The other common scenerio is a transient '
+          msg += 'or similar. The other common scenario is a transient '
           msg += 'error such as an unresponsive mirror.'
           raise msg
         # fallback rescue above should catch most of the errors
@@ -368,8 +368,16 @@ module Kitchen
         lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
         begin
           lockfile.lock
-          with_retries { ::Docker::Container.get(chef_container_name, {}, docker_connection) }
+          with_retries {
+            # TEMPORARY FIX - docker-api 2.0.0 has a buggy Docker::Container.get - use .all instead
+            # https://github.com/swipely/docker-api/issues/566
+            # ::Docker::Container.get(chef_container_name, {}, docker_connection)
+            found = ::Docker::Container.all({all: true}, docker_connection).select { |c| c.info["Names"].include?("/#{chef_container_name}") }
+            raise ::Docker::Error::NotFoundError.new(chef_container_name) if found.empty?
+            debug "Chef container already exists, continuing"
+          }
         rescue ::Docker::Error::NotFoundError
+          debug "Chef container does not exist, creating a new Chef container"
           with_retries do
             begin
               debug "driver - creating volume container #{chef_container_name} from #{chef_image}"

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.11.1'.freeze
+    DOKKEN_VERSION = '2.11.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.11.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api