kitchen-dokken 2.1.5 → 2.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a91ac9b56f96c01fe2be248a7f4339f47f8c7c62
4
- data.tar.gz: 0151874c1aebd4282ba92e07e165c3a0e16790fa
3
+ metadata.gz: 9542662c0401ceb1ecf7c7ee9b2f64bb93235abb
4
+ data.tar.gz: f8f22845915285d458affc73c68d4cd063aa1e22
5
5
  SHA512:
6
- metadata.gz: 4a80a6a8c200e831ef4a2ea5382eabf7561a07a6bc3906471f4b21ee7facb008aeb1d3eef014f4a23b1fdfd5afce31c7f67b1a8a20a8980747f81967885a1607
7
- data.tar.gz: 4e3e1ffd8e48694c6f8235ebfd33621ce3885a9b8fe493d1ca6a942489e5b95477c45941313b072f481b25a7272a8d3e30af22fe1a5a80a4e8cdb944bf14afcc
6
+ metadata.gz: c21a4687a8256b3819617b879c4d9ce3c2eab2bc551d7f291c1c84e92a0e3082509929646e138c9508fc83399d6aff535657fecd54b8ce773af7afa40c679ade
7
+ data.tar.gz: e65d5623e21ce1df2409c43fbdc00fdfe6ec3ffa19e00eafd65a8dc9d320c0cafc8d21496dabfadcaef96d0de3c8a8385201c5c701463e17b0affb38b628c300
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Dokken Changelog
2
2
 
3
+ # 2.1.6
4
+ - #102 - Use platform name for image unless specified
5
+
3
6
  # 2.1.5
4
7
  - Fixing (again) latest/current logic (thanks @tas50)
5
8
 
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Author:: Sean OMeara (<sean@chef.io>)
1
+ Author:: Sean OMeara (<sean@sean.io>)
2
2
 
3
3
  Copyright (C) 2015, Sean OMeara
4
4
 
@@ -1,5 +1,5 @@
1
1
  #
2
- # Author:: Sean OMeara (<sean@chef.io>)
2
+ # Author:: Sean OMeara (<sean@sean.io>)
3
3
  #
4
4
  # Copyright (C) 2015, Sean OMeara
5
5
  #
@@ -30,14 +30,14 @@ module Kitchen
30
30
  module Driver
31
31
  # Dokken driver for Kitchen.
32
32
  #
33
- # @author Sean OMeara <sean@chef.io>
33
+ # @author Sean OMeara <sean@sean.io>
34
34
  class Dokken < Kitchen::Driver::Base
35
35
  default_config :api_retries, 20
36
36
  default_config :binds, []
37
37
  default_config :cap_add, nil
38
38
  default_config :cap_drop, nil
39
39
  default_config :chef_image, 'chef/chef'
40
- default_config :chef_version, 'current'
40
+ default_config :chef_version, 'latest'
41
41
  default_config :data_image, 'dokken/kitchen-cache:latest'
42
42
  default_config :dns, nil
43
43
  default_config :dns_search, nil
@@ -418,7 +418,12 @@ module Kitchen
418
418
  end
419
419
 
420
420
  def platform_image
421
- config[:image]
421
+ config[:image] || platform_image_from_name
422
+ end
423
+
424
+ def platform_image_from_name
425
+ platform, release = instance.platform.name.split('-')
426
+ release ? [platform, release].join(':') : platform
422
427
  end
423
428
 
424
429
  def exposed_ports(config, rules)
@@ -1,6 +1,6 @@
1
1
  # -*- encoding: utf-8 -*-
2
2
  #
3
- # Author:: Sean OMeara (<sean@chef.io>)
3
+ # Author:: Sean OMeara (<sean@sean.io>)
4
4
  #
5
5
  # Copyright (C) 2015, Sean OMeara
6
6
  #
@@ -19,6 +19,6 @@
19
19
  module Kitchen
20
20
  module Driver
21
21
  # Version string for Dokken Kitchen driver
22
- DOKKEN_VERSION = '2.1.5'.freeze
22
+ DOKKEN_VERSION = '2.1.6'.freeze
23
23
  end
24
24
  end
@@ -1,5 +1,5 @@
1
1
  #
2
- # Author:: Sean OMeara (<sean@chef.io>)
2
+ # Author:: Sean OMeara (<sean@sean.io>)
3
3
  #
4
4
  # Copyright (C) 2015, Sean OMeara
5
5
  #
@@ -27,13 +27,13 @@ module Kitchen
27
27
  module Transport
28
28
  # Wrapped exception for any internally raised errors.
29
29
  #
30
- # @author Sean OMeara <sean@chef.io>
30
+ # @author Sean OMeara <sean@sean.io>
31
31
  class DockerExecFailed < TransportFailed; end
32
32
 
33
33
  # A Transport which uses Docker tricks to execute commands and
34
34
  # transfer files.
35
35
  #
36
- # @author Sean OMeara <sean@chef.io>
36
+ # @author Sean OMeara <sean@sean.io>
37
37
  class Dokken < Kitchen::Transport::Base
38
38
  kitchen_transport_api_version 2
39
39
 
@@ -57,7 +57,7 @@ module Kitchen
57
57
  end
58
58
  end
59
59
 
60
- # @author Sean OMeara <sean@chef.io>
60
+ # @author Sean OMeara <sean@sean.io>
61
61
  class Connection < Kitchen::Transport::Dokken::Connection
62
62
  def docker_connection
63
63
  @docker_connection ||= ::Docker::Connection.new(options[:docker_host_url], options[:docker_host_options])
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-dokken
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.5
4
+ version: 2.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean OMeara
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-01 00:00:00.000000000 Z
11
+ date: 2017-05-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -40,7 +40,7 @@ dependencies:
40
40
  version: '1.33'
41
41
  description: A Test Kitchen Driver for Dokken
42
42
  email:
43
- - sean@chef.io
43
+ - sean@sean.io
44
44
  executables: []
45
45
  extensions: []
46
46
  extra_rdoc_files: []