kitchen-dokken 2.20.0 → 2.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7968068f2971454ab8aae38e6a448c513bb094b908fdbd98272b545ed4eb84ed
-  data.tar.gz: cff7edf63103c4337eddd245b1ee8a247516c1cb67c45d14747e143b652d1522
+  metadata.gz: ac52c253c019253b9fe2cffdbf603ce33647e51aacb8376ae775b2158ed0ca5e
+  data.tar.gz: be18132016e30bae541416a33e88846d2e1a9cb72849fe3fb80d9a0b1c0941a6
 SHA512:
-  metadata.gz: 3b82a6d24f3ceb8619c8ee4ac3b0f72156efa678dead489fbe812ae3bb8114a864a89ed794aa70dd0a5e7d0f94daf7cd7cdabbca69302c8df0f1ef9f9e4af2a3
-  data.tar.gz: be4ebb93a209623830ec4333d82dd82d845ae1e5077c65a60a5bb771665eef897d97d8c84536e21c498a2ef6722357cacd40d0e7691ce9ba852a624a8edd774b
+  metadata.gz: 01f86365eecc3ad220c0ac09e561b76fd85d47de80447ef60234ab21e0ca00549fc88b13771a1328398953c47a87cab2ee5cfddcca32b0fb1e8186ee34ba1d7e
+  data.tar.gz: dab5b5621092142df080ed34ad3d73449964c067ed65600cc45efed62b527da41e40da3e13c20915d07d0e0cf7c96a4a602b3cfd6efaf2b06e47b100841f67be

data/lib/kitchen/driver/dokken.rb

@@ -236,22 +236,10 @@ module Kitchen
         [image_prefix, instance_name].compact.join("/").downcase
       end
 
-      def dokken_binds
-        ret = []
-        ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil? || remote_docker_host? || running_inside_docker?
-        ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil? || remote_docker_host? || running_inside_docker?
-        ret << Array(config[:binds]) unless config[:binds].nil?
-        ret.flatten
-      end
-
       def dokken_tmpfs
         coerce_tmpfs(config[:tmpfs])
       end
 
-      def dokken_volumes
-        coerce_volumes(config[:volumes])
-      end
-
       def coerce_tmpfs(v)
         case v
         when Hash, nil
@@ -264,7 +252,14 @@ module Kitchen
         end
       end
 
-      def coerce_volumes(v)
+      def dokken_volumes_from
+        ret = []
+        ret << chef_container_name
+        ret << data_container_name if remote_docker_host? || running_inside_docker?
+        ret
+      end
+
+      def coerce_volumes(v, binds)
         case v
         when PartialHash, nil
           v
@@ -272,29 +267,38 @@ module Kitchen
           PartialHash[v]
         else
           b = []
-          v = Array(v).to_a # in case v.is_A?(Chef::Node::ImmutableArray)
           v.delete_if do |x|
             parts = x.split(":")
             b << x if parts.length > 1
           end
           b = nil if b.empty?
-          config[:binds].push(b) unless config[:binds].include?(b) || b.nil?
+          binds.push(b) unless binds.include?(b) || b.nil?
           return PartialHash.new if v.empty?
 
           v.each_with_object(PartialHash.new) { |volume, h| h[volume] = {} }
         end
       end
 
-      def dokken_volumes_from
-        ret = []
-        ret << chef_container_name
-        ret << data_container_name if remote_docker_host? || running_inside_docker?
-        ret
+      def calc_volumes_binds
+        volumes = Array.new(Array(config[:volumes]))
+        binds = Array.new(Array(config[:binds]))
+
+        # Binds is mutated in-place, volumes *may* be.
+        volumes = coerce_volumes(volumes, binds)
+
+        binds_ret = []
+        binds_ret << "#{dokken_kitchen_sandbox}:/opt/kitchen" unless dokken_kitchen_sandbox.nil? || remote_docker_host? || running_inside_docker?
+        binds_ret << "#{dokken_verifier_sandbox}:/opt/verifier" unless dokken_verifier_sandbox.nil? || remote_docker_host? || running_inside_docker?
+        binds_ret << binds unless binds.nil?
+
+        [volumes, binds_ret.flatten]
       end
 
       def start_runner_container(state)
         debug "driver - starting #{runner_container_name}"
 
+        volumes, binds = calc_volumes_binds
+
         config = {
           "name" => runner_container_name,
           "Cmd" => Shellwords.shellwords(self[:pid_one_command]),
@@ -303,11 +307,11 @@ module Kitchen
           "Hostname" => self[:hostname],
           "Env" => self[:env],
           "ExposedPorts" => exposed_ports,
-          "Volumes" => dokken_volumes,
+          "Volumes" => volumes,
           "HostConfig" => {
             "Privileged" => self[:privileged],
             "VolumesFrom" => dokken_volumes_from,
-            "Binds" => dokken_binds,
+            "Binds" => binds,
             "Dns" => self[:dns],
             "DnsSearch" => self[:dns_search],
             "Links" => Array(self[:links]),
@@ -319,14 +323,16 @@ module Kitchen
             "Tmpfs" => dokken_tmpfs,
             "Memory" => self[:memory_limit],
           },
-          "NetworkingConfig" => {
+        }
+        unless %w{host bridge}.include?(self[:network_mode])
+          config["NetworkingConfig"] = {
             "EndpointsConfig" => {
               self[:network_mode] => {
                 "Aliases" => Array(self[:hostname]).concat(Array(self[:hostname_aliases])),
               },
             },
-          },
-        }
+          }
+        end
         unless self[:entrypoint].to_s.empty?
           config["Entrypoint"] = self[:entrypoint]
         end
@@ -360,19 +366,23 @@ module Kitchen
             "PublishAllPorts" => true,
             "NetworkMode" => "bridge",
           },
-          "NetworkingConfig" => {
+        }
+        unless %w{host bridge}.include?(self[:network_mode])
+          config["NetworkingConfig"] = {
             "EndpointsConfig" => {
               self[:network_mode] => {
                 "Aliases" => Array(self[:hostname]),
               },
             },
-          },
-        }
+          }
+        end
         data_container = run_container(config)
         state[:data_container] = data_container.json
       end
 
       def make_dokken_network
+        return unless self[:network_mode] == "dokken"
+
         lockfile = Lockfile.new "#{home_dir}/.dokken-network.lock"
         begin
           lockfile.lock

data/lib/kitchen/driver/dokken_version.rb

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

metadata

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