kitchen-dokken 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e00103fefe2a49fd2630337f2a8d0bb0932484b770704b69c1fb31d9ddd0b42
-  data.tar.gz: 0acea78f249845712be9d1f97094f190369a1e15707ac559de27be5fc6c29e31
+  metadata.gz: 517d0d0706aed8e8fc5889c874d6817fe65cfa571ba3a7a082d8256f707986cd
+  data.tar.gz: f5beb66dc47d9c4f58022c26af3ce8657c7fae40443eb2d3ee1b5ef2c01f5d0e
 SHA512:
-  metadata.gz: 0d84bd393b040ef4bc771a5d5c4448dff1860a9244d0818341f06c834e8133cbd9a77b0b7a4f697c8873be24b567083556f4feb47a57723782fe6575ad7b2a1a
-  data.tar.gz: b628d6bce7009efa94713c5c6032ec81e3258686c84f22ebd430e1710a1817cfaf3cb82420a8109e21f1506ff0e661c08da1e6fb2d5baedd6adbb216a0dedaa8
+  metadata.gz: fd3d097a36e249e21f88ea3a1999207f9e45e464a9eb649d10c870d24d4a0705766dfb57df3ced2c82cda4e6cee04d5b53587b36743dbdd887da036d00c5d7c8
+  data.tar.gz: 755b9671c1aa2cbf14a90ddb9c730e3d50d5326a6244f2d8ece875b5bf5b5e9567c3c5f9661cd6cb6a00e6e4ec0594efcd5aa2fe0daf56e0fca7bf78c6a76d61

data/lib/kitchen/driver/dokken.rb

@@ -169,8 +169,10 @@ module Kitchen
       end
 
       def work_image_dockerfile
+        from = registry_image_path(platform_image)
+        debug("driver - Building work image from #{from}")
         dockerfile_contents = [
-          "FROM #{platform_image}",
+          "FROM #{from}",
           "LABEL X-Built-By=kitchen-dokken X-Built-From=#{platform_image}",
         ]
         Array(config[:intermediate_instructions]).each do |c|
@@ -287,7 +289,8 @@ module Kitchen
         config = {
           "name" => runner_container_name,
           "Cmd" => Shellwords.shellwords(self[:pid_one_command]),
-          "Image" => "#{repo(work_image)}:#{tag(work_image)}",
+          # locally built image, must use short-name
+          "Image" => short_image_path(work_image),
           "Hostname" => self[:hostname],
           "Env" => self[:env],
           "ExposedPorts" => exposed_ports,
@@ -329,7 +332,8 @@ module Kitchen
         debug "driver - creating #{data_container_name}"
         config = {
           "name" => data_container_name,
-          "Image" => "#{repo(data_image)}:#{tag(data_image)}",
+          # locally built image, must use short-name
+          "Image" => short_image_path(data_image),
           "HostConfig" => {
             "PortBindings" => port_bindings,
             "PublishAllPorts" => true,
@@ -352,7 +356,7 @@ module Kitchen
         begin
           lockfile.lock
           with_retries { ::Docker::Network.get("dokken", {}, docker_connection) }
-        rescue
+        rescue ::Docker::Error::NotFoundError
           begin
             with_retries { ::Docker::Network.create("dokken", {}) }
           rescue ::Docker::Error => e
@@ -388,14 +392,14 @@ module Kitchen
             config = {
               "name" => chef_container_name,
               "Cmd" => "true",
-              "Image" => "#{repo(chef_image)}:#{tag(chef_image)}",
+              "Image" => registry_image_path(chef_image),
               "HostConfig" => {
                 "NetworkMode" => self[:network_mode],
               },
             }
             chef_container = create_container(config)
             state[:chef_container] = chef_container.json
-          rescue ::Docker::Error => e
+          rescue ::Docker::Error, StandardError => e
             raise "driver - #{chef_container_name} failed to create #{e}"
           end
         ensure
@@ -404,12 +408,12 @@ module Kitchen
       end
 
       def pull_platform_image
-        debug "driver - pulling #{chef_image} #{repo(platform_image)} #{tag(platform_image)}"
+        debug "driver - pulling #{short_image_path(platform_image)}"
         config[:pull_platform_image] ? pull_image(platform_image) : pull_if_missing(platform_image)
       end
 
       def pull_chef_image
-        debug "driver - pulling #{chef_image} #{repo(chef_image)} #{tag(chef_image)}"
+        debug "driver - pulling #{short_image_path(chef_image)}"
         config[:pull_chef_image] ? pull_image(chef_image) : pull_if_missing(chef_image)
       end
 
@@ -422,7 +426,7 @@ module Kitchen
 
       def container_exist?(name)
         return true if ::Docker::Container.get(name, {}, docker_connection)
-      rescue
+      rescue StandardError, ::Docker::Error::NotFoundError
         false
       end
 
@@ -440,10 +444,45 @@ module Kitchen
         [repo, tag]
       end
 
+      # Return the 'repo' half of a docker image path. Agnostic about if a
+      # registry is included, this effectively is just "before the colon"
+      #
+      # @param image [String] the docker image path to parse
+      # @return [String] the repo portion of `image`
       def repo(image)
         parse_image_name(image)[0]
       end
 
+      # Return the 'tag' of a docker image path. Will be `latest` if there
+      # is no explicit tag in the image path.
+      #
+      # @param image [String] the docker image path to parse
+      # @return [String] the tag of `image`
+      def tag(image)
+        parse_image_name(image)[1]
+      end
+
+      # Ensures an explicit tag on an image path.
+      #
+      # @param image [String] the docker image path to parse
+      # @return [String] `repo`:`tag`
+      def short_image_path(image)
+        "#{repo(image)}:#{tag(image)}"
+      end
+
+      # Qualifies the results of `short_image_path` with any registry the
+      # user has requested
+      #
+      # @param image [String] the docker image path to parse
+      # @return [String] The most fully-qualified registry path we cn make
+      def registry_image_path(image)
+        if config[:docker_registry]
+          "#{config[:docker_registry]}/#{short_image_path(image)}"
+        else
+          short_image_path(image)
+        end
+      end
+
       def create_container(args)
         with_retries { @container = ::Docker::Container.get(args["name"], {}, docker_connection) }
       rescue
@@ -511,10 +550,6 @@ module Kitchen
         end
       end
 
-      def tag(image)
-        parse_image_name(image)[1]
-      end
-
       def chef_container_name
         "chef-#{chef_version}"
       end
@@ -547,7 +582,7 @@ module Kitchen
       end
 
       def pull_if_missing(image)
-        return if ::Docker::Image.exist?("#{repo(image)}:#{tag(image)}", {}, docker_connection)
+        return if ::Docker::Image.exist?(registry_image_path(image), {}, docker_connection)
 
         pull_image image
       end
@@ -557,21 +592,14 @@ module Kitchen
         val.sub(%r{https?://}, "").split("/").first
       end
 
-      def image_path(image)
-        fqimage = "#{repo(image)}:#{tag(image)}"
-        if config[:docker_registry]
-          fqimage = "#{config[:docker_registry]}/#{fqimage}"
-        end
-        fqimage
-      end
-
       def pull_image(image)
+        path = registry_image_path(image)
         with_retries do
-          if Docker::Image.exist?(image_path(image), {}, docker_connection)
-            original_image = Docker::Image.get(image_path(image), {}, docker_connection)
+          if Docker::Image.exist?(path, {}, docker_connection)
+            original_image = Docker::Image.get(path, {}, docker_connection)
           end
 
-          new_image = Docker::Image.create({ "fromImage" => "#{repo(image)}:#{tag(image)}" }, docker_connection)
+          new_image = Docker::Image.create({ "fromImage" => path }, docker_connection)
 
           !(original_image && original_image.id.start_with?(new_image.id))
         end

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.12.0".freeze
+    DOKKEN_VERSION = "2.12.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api