kitchen-dokken 2.1.10 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0571ca8dbfba7cae0fad6b8443ec0abe1e8bf0b3
-  data.tar.gz: 4f5c87a8ffad2043a354f89ec6b7ffbb90af00b6
+  metadata.gz: d82d62b99b5e5b0b3a7473ea621641c57d3e85d1
+  data.tar.gz: f1ee267ee61e13c37662731f2e3b6a6a7912986e
 SHA512:
-  metadata.gz: 65cd7ad6703ae3c74354e722333c224de58f5cf5d387b73ac2884f340f4dddfaf11cd0d3e25c6f3fdb795bcd7c175c3c9f0e4db9f7478d3509d8577970e829eb
-  data.tar.gz: e904d1e6409a57359bdea3b8aac4cc9690a45a7a93874b3610b13351f608ac66d4d793998b2d482ab9866c142ca458061139d15ccb5c8cc7337e1af2a081479a
+  metadata.gz: ff69a7549fe0659fd10710c84e2e1f74a32ea0f7f940b7292a9add78a449fc8157af8e3686508fb2a591cd78e989383dcdab115cda163d3498dd1f74646a1fd0
+  data.tar.gz: 4e0939f5ef9e8b8a1dd4a5f8f9854271a8ec81bd441f012fbe63771f7236f9f86e643631b0a1d43b97948e7ec2ac204755738ead59224ac8e431bfe25109485d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Dokken Changelog
 
+# 2.2.0
+- Initial support for clusters / inter-suite name resolution
+- Dokken now creates a user-defined network named "dokken" and
+  connects containers to it. This allows us to take advantage of the
+  built in DNS server that in Docker 1.10 and later.
+
+  driver:
+    hostname: www.computers.biz
+
 # 2.1.10
 - Adding boot2docker detection
 

data/lib/kitchen/driver/dokken.rb

@@ -44,10 +44,10 @@ module Kitchen
       default_config :docker_info, docker_info
       default_config :docker_host_url, default_docker_host
       default_config :forward, nil
-      default_config :hostname, nil
+      default_config :hostname, 'dokken'
       default_config :image_prefix, nil
       default_config :links, nil
-      default_config :network_mode, 'bridge'
+      default_config :network_mode, 'dokken'
       default_config :pid_one_command, 'sh -c "trap exit 0 SIGTERM; while :; do sleep 1; done"'
       default_config :privileged, false
       default_config :read_timeout, 3600
@@ -64,6 +64,9 @@ module Kitchen
         pull_chef_image
         create_chef_container state
 
+        # network
+        make_dokken_network
+
         # data
         dokken_create_sandbox
 
@@ -237,43 +240,67 @@ module Kitchen
       def start_runner_container(state)
         debug "driver - starting #{runner_container_name}"
 
-        runner_container = run_container(
+        config = {
           'name' => runner_container_name,
-          'Cmd' => Shellwords.shellwords(config[:pid_one_command]),
+          'Cmd' => Shellwords.shellwords(self[:pid_one_command]),
           'Image' => "#{repo(work_image)}:#{tag(work_image)}",
-          'Hostname' => config[:hostname],
-          'ExposedPorts' => exposed_ports({}, config[:forward]),
+          'Hostname' => self[:hostname],
+          'ExposedPorts' => exposed_ports({}, self[:forward]),
           'Volumes' => dokken_volumes,
           'HostConfig' => {
-            'Privileged' => config[:privileged],
+            'Privileged' => self[:privileged],
             'VolumesFrom' => dokken_volumes_from,
             'Binds' => dokken_binds,
-            'Dns' => config[:dns],
-            'DnsSearch' => config[:dns_search],
-            'Links' => Array(config[:links]),
-            'CapAdd' => Array(config[:cap_add]),
-            'CapDrop' => Array(config[:cap_drop]),
-            'SecurityOpt' => Array(config[:security_opt]),
-            'NetworkMode' => config[:network_mode],
-            'PortBindings' => port_forwards({}, config[:forward]),
-          }
-        )
+            'Dns' => self[:dns],
+            'DnsSearch' => self[:dns_search],
+            'Links' => Array(self[:links]),
+            'CapAdd' => Array(self[:cap_add]),
+            'CapDrop' => Array(self[:cap_drop]),
+            'SecurityOpt' => Array(self[:security_opt]),
+            'NetworkMode' => self[:network_mode],
+            'PortBindings' => port_forwards({}, self[:forward]),
+          },
+          'NetworkingConfig' => {
+            'EndpointsConfig' => {
+              self[:network_mode] => {
+                'Aliases' => Array(self[:hostname]),
+              },
+            },
+          },
+        }
+        runner_container = run_container(config)
         state[:runner_container] = runner_container.json
       end
 
       def start_data_container(state)
         debug "driver - creating #{data_container_name}"
-        data_container = run_container(
+        config = {
           'name' => data_container_name,
           'Image' => "#{repo(data_image)}:#{tag(data_image)}",
           'HostConfig' => {
             'PortBindings' => port_forwards({}, '22'),
             'PublishAllPorts' => true,
-          }
-        )
+            'NetworkMode' => self[:network_mode],
+          },
+          'NetworkingConfig' => {
+            'EndpointsConfig' => {
+              self[:network_mode] => {
+                'Aliases' => self[:hostname],
+              },
+            },
+          },
+        }
+        data_container = run_container(config)
         state[:data_container] = data_container.json
       end
 
+      def make_dokken_network
+        debug 'driver - creating dokken network'
+        Docker::Network.create('dokken', {})
+      rescue
+        debug 'driver - dokken network already exists'
+      end
+
       def make_data_image
         debug 'driver - calling create_data_image'
         create_data_image
@@ -287,7 +314,8 @@ module Kitchen
           chef_container = create_container(
             'name' => chef_container_name,
             'Cmd' => 'true',
-            'Image' => "#{repo(chef_image)}:#{tag(chef_image)}"
+            'Image' => "#{repo(chef_image)}:#{tag(chef_image)}",
+            'NetworkMode' => config[:network_mode]
           )
           state[:chef_container] = chef_container.json
         rescue

data/lib/kitchen/driver/dokken_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = '2.1.10'.freeze
+    DOKKEN_VERSION = '2.2.0'.freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -137,11 +137,7 @@ EOF
     end
 
     def instance_name
-      prefix = if config[:image_prefix].nil?
-                 (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
-               else
-                 config[:image_prefix]
-               end
+      prefix = (Digest::SHA2.hexdigest FileUtils.pwd)[0, 10]
       "#{prefix}-#{instance.name}"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean OMeara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen