kitchen-dokken 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1331d108ec0fd4f436ec283eea7b297e8ba7ddbd
-  data.tar.gz: 8b7c178ffc9bac18f8cdac11fc61e96eda4fe600
+  metadata.gz: 60e2ad59397194be230673615a799951113e06a5
+  data.tar.gz: aa1487f1397b039d131a53cbe6ecd5d00287f11e
 SHA512:
-  metadata.gz: cd1a6c190c6cc3e50dc3df2459281da2c651cb95f86a66d2c3f85efd877e226f6f732b8d74eed64be1646344548c75ae2a8ec2bd885dbfcb6236d000db389c2a
-  data.tar.gz: 957ca38b58e557d28c6f8da2fb6bced0dc1fc0b5d9dce0f47282283123715efe4510a958403bb45624d2496d2e034353de536d7a36a7291df95ea78fd653a811
+  metadata.gz: 13032c9258781c1e309f0477c9dee736354b5397cfdc93006cf897882f6b6f9bbab61c4a80847c566ea8c34def9f106e4630ec4a403e49bcd683f5660c0a5278
+  data.tar.gz: 70488a3094a0bde091a18bd73aff17dfb79fd8ff7a960149926eb864d5ef473d0322dcf247e55ee373746833e0818f927072e990c66b7af32160cdd5f6eb901f

data/lib/kitchen/driver/dokken.rb

@@ -64,18 +64,20 @@ module Kitchen
         save_misc_state state
       end
 
-      def api_retries
-        config[:api_retries]
-      end
-
       def destroy(_state)
-        delete_data
-        delete_runner
+        stop_data_container
+        delete_data_container
+        stop_runner_container
+        delete_runner_container
         delete_work_image
       end
 
       private
 
+      def api_retries
+        config[:api_retries]
+      end
+
       def docker_connection
         opts = Docker.options
         opts[:read_timeout] = config[:read_timeout]
@@ -97,22 +99,19 @@ module Kitchen
 
         begin
           with_retries do
-            @work_image = Docker::Image.build_from_dir(
+            @intermediate_image = Docker::Image.build_from_dir(
               context_root,
-              { 'nocache' => true, 'forcerm' => true },
+              {
+                'nocache' => true,
+                'forcerm' => true,
+                'q' => true,
+                't' => work_image
+              },
               docker_connection
             )
           end
         rescue
-          raise 'work_image build failed'
-        end
-
-        with_retries do
-          @work_image.tag(
-            'repo' => repo(work_image),
-            'tag' => tag(work_image),
-            'force' => true
-          )
+          fail 'work_image build failed'
         end
         state[:work_image] = work_image
       end
@@ -140,32 +139,42 @@ module Kitchen
         instance.name
       end
 
-      def instance_platform_name
-        instance.platform.name
+      def delete_chef_container
+        debug "driver - deleting container #{chef_container_name}"
+        delete_container chef_container_name
       end
 
-      def work_image
-        return "#{image_prefix}/#{instance_name}" unless image_prefix.nil?
-        instance_name
+      def delete_data_container
+        debug "driver - deleting container #{data_container_name}"
+        delete_container data_container_name
+      end
+
+      def delete_runner_container
+        debug "driver - deleting container #{runner_container_name}"
+        delete_container runner_container_name
       end
 
       def image_prefix
         config[:image_prefix]
       end
 
-      def delete_runner
-        debug "driver - deleting container #{runner_container_name}"
-        delete_container runner_container_name
+      def instance_platform_name
+        instance.platform.name
       end
 
-      def delete_chef_container
-        debug "driver - deleting container #{chef_container_name}"
-        delete_container chef_container_name
+      def stop_runner_container
+        debug "driver - stopping container #{runner_container_name}"
+        stop_container runner_container_name
       end
 
-      def delete_data
-        debug "driver - deleting container #{data_container_name}"
-        delete_container data_container_name
+      def stop_data_container
+        debug "driver - stopping container #{data_container_name}"
+        stop_container data_container_name
+      end
+
+      def work_image
+        return "#{image_prefix}/#{instance_name}" unless image_prefix.nil?
+        instance_name
       end
 
       def start_runner_container(state)
@@ -272,27 +281,23 @@ module Kitchen
         @container ? @container.info['State'] : {}
       end
 
-      def delete_container(name)
+      def stop_container(name)
         begin
-          puts "Destroying container #{name}."
           with_retries { @container = Docker::Container.get(name, docker_connection) }
-        rescue
-          puts "Container #{name} not found. Nothing to destroy"
-          return
-        end
-
-        begin
           with_retries do
             @container.stop(force: true)
-            wait_running_state(args['name'], false)
+            wait_running_state(name, false)
           end
-        rescue
+        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.delete(force: true, v: true) }
-        rescue
+        rescue Docker::Error::NotFoundError
           debug "Container #{name} not found. Nothing to delete."
         end
       end
@@ -313,37 +318,37 @@ module Kitchen
         image.split(':')[1] || 'latest'
       end
 
-      def pull_image(image)
-        with_retries { Docker::Image.create({ 'fromImage' => repo(image), 'tag' => tag(image) }, docker_connection) }
-      end
-
-      def pull_if_missing(image)
-        return if Docker::Image.exist?("#{repo(image)}:#{tag(image)}", docker_connection)
-        pull_image image
+      def chef_container_name
+        "chef-#{chef_version}"
       end
 
-      def platform_image
-        config[:image]
+      def chef_image
+        "someara/chef:#{chef_version}"
       end
 
       def chef_version
         config[:chef_version]
       end
 
-      def chef_image
-        "someara/chef:#{chef_version}"
-      end
-
-      def chef_container_name
-        "chef-#{chef_version}"
+      def data_container_name
+        "#{instance.name}-data"
       end
 
       def data_image
         config[:data_image]
       end
 
-      def data_container_name
-        "#{instance.name}-data"
+      def platform_image
+        config[:image]
+      end
+
+      def pull_if_missing(image)
+        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' => tag(image) }, docker_connection) }
       end
 
       def runner_container_name

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.18'
+    DOKKEN_VERSION = '0.0.19'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Sean OMeara