kitchen-dokken 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2c56872e677b62fbf05ef40c34c09cce7563be
-  data.tar.gz: 62d3932c0e1ad83526ea7ff40ee7007bb549ccd3
+  metadata.gz: df5fc9ab1a4677a9b159b88dd83550201402b1b3
+  data.tar.gz: 231e77bfb9af35a97d3ab0ab539d42f07c1b6378
 SHA512:
-  metadata.gz: 3781d2441c8e0ce8330bb7ae87e0fff86b68d5779fe477fcdb909bda245eec3dfbf25656277c8775dea571d373ae663fa5daf2a1d27089c652f4baeac212305c
-  data.tar.gz: 499b1cb0cecb49bad1459ca26ca037e31c1c8e6b16a33255897e7c0b1cc998af9ca92f2c0250afdf0e5f5e12b77b8042f8c34e557bc7edb25ede1bd695d2b5dd
+  metadata.gz: 50c08510ea829c301145272affec2fd5f053c674cad8dbf1e405344596d788ccb96190f722d386b2763a5232a5f9ec3a56a162a3bdfa0dc46207710d4da13b15
+  data.tar.gz: 97378652af596204da5a1ba946444f3a14051697bae1a0889585d12f5ebf367ff465f108c8f7acef2ef81781adfd77d90e9ffb87eb51a1346fcf868b6e2eb360

data/lib/kitchen/driver/dokken.rb

@@ -47,6 +47,7 @@ module Kitchen
       default_config :cap_add, nil
       default_config :cap_drop, nil
       default_config :security_opt, nil
+      default_config :forward, nil
       default_config :network_mode, 'bridge'
 
       # (see Base#create)
@@ -96,12 +97,17 @@ module Kitchen
       def delete_work_image
         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) }
+
+        begin
+          with_retries { @work_image.remove(force: true) }
+        rescue ::Docker::Error::ConflictError
+          debug "driver - #{work_image} cannot be removed"
+        end
       end
 
       def build_work_image(state)
         # require 'pry' ; binding.pry
-        
+
         return if ::Docker::Image.exist?(work_image, docker_connection)
 
         FileUtils.mkdir_p context_root
@@ -121,7 +127,7 @@ module Kitchen
             )
           end
         rescue Exception => e
-          fail  "work_image build failed: #{e}" 
+          fail  "work_image build failed: #{e}"
         end
         state[:work_image] = work_image
       end
@@ -195,6 +201,7 @@ module Kitchen
           'Cmd' => Shellwords.shellwords(config[:pid_one_command]),
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
           'Hostname' => config[:hostname],
+          'ExposedPorts' => exposed_ports({}, config[:forward]),
           'HostConfig' => {
             'Privileged' => config[:privileged],
             'VolumesFrom' => [chef_container_name, data_container_name],
@@ -204,6 +211,7 @@ module Kitchen
             'CapDrop' => Array(config[:cap_drop]),
             'SecurityOpt' => Array(config[:security_opt]),
             'NetworkMode' => config[:network_mode],
+            'PortBindings' => port_forwards({}, config[:forward]),
           }
         )
         state[:runner_container] = runner_container.json
@@ -214,11 +222,7 @@ module Kitchen
         data_container = run_container(
           'name' => data_container_name,
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
-          'PortBindings' => {
-            '22/tcp' => [
-              { 'HostPort' => '' }
-            ]
-          },
+          'PortBindings' => port_forwards({}, "22"),
           'PublishAllPorts' => true
         )
         # require 'pry' ; binding.pry
@@ -245,7 +249,7 @@ module Kitchen
           )
           state[:chef_container] = chef_container.json
         rescue
-          debug "driver - #{chef_container_name} alreay exists"
+          debug "driver - #{chef_container_name} already exists"
         end
       end
 
@@ -360,12 +364,30 @@ module Kitchen
         config[:image]
       end
 
+      def exposed_ports(config, rules)
+        Array(rules).each do |prt_string|
+          guest, host = prt_string.to_s.split(":").reverse
+          config["#{guest}/tcp"] = {}
+        end
+        config
+      end
+
+      def port_forwards(config, rules)
+        Array(rules).each do |prt_string|
+          guest, host = prt_string.to_s.split(":").reverse
+          config["#{guest}/tcp"] = [{
+            :HostPort => host || ''
+          }]
+        end
+        config
+      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)        
+      def pull_image(image)
         with_retries {
           ::Docker::Image.create({ 'fromImage' => "#{repo(image)}:#{tag(image)}" }, docker_connection)
         }

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.33'
+    DOKKEN_VERSION = '0.0.34'
   end
 end

metadata

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