kitchen-docker 0.11.0 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 01504e904382e28f4e7266e80c30dc30f1cd99e0
4
- data.tar.gz: df349d321e63c293fc02885b61a258c3de3bc32f
3
+ metadata.gz: 020ed1c5e1d45078dd7a156fd22d8218f60cfc48
4
+ data.tar.gz: 8b0fcd6623219491a98f814cc8567b07341dcce2
5
5
  SHA512:
6
- metadata.gz: 0d364a5dc81351e8967c3497889c9af6faf3f9f3fa20d46d2ca3550abd5c675c1f37390be3d2010c48bccf8a1b29b9e111eab8f88491c33396529204cc1ddf79
7
- data.tar.gz: 341061362e08178833f72ff7382cf45ba225c8c6f56af32ae476bb19e733153ade2c654b0c7e933fcab324da751a29a1698752c83c392152e0e6366917724ed0
6
+ metadata.gz: ea010af41b34884fa0a0959f9856369d38652c1a6defa6930054ecacff3de64f1bc8bd2abc9cb3af25f44910528e9d8c555d1255dbee3c2c4021cb39d461e710
7
+ data.tar.gz: 7f4eb83f53079bdb1474ef602c0e94bbba9297a2e5505e4536ee7263d6931825e4387aeb4764b3b666bc10f76c5f6bf3efa1eb9b2712737808b4055317092d3c
@@ -26,12 +26,15 @@ module Kitchen
26
26
  # @author Sean Porter <portertech@gmail.com>
27
27
  class Docker < Kitchen::Driver::SSHBase
28
28
 
29
- default_config :username, 'kitchen'
30
- default_config :password, 'kitchen'
31
- default_config :require_chef_omnibus, true
32
- default_config :remove_images, false
33
- default_config :privileged, false
34
- default_config :use_sudo, true
29
+ default_config :socket, nil
30
+ default_config :privileged, false
31
+ default_config :remove_images, false
32
+ default_config :username, 'kitchen'
33
+ default_config :password, 'kitchen'
34
+
35
+ default_config :use_sudo do |driver|
36
+ !driver.remote_socket?
37
+ end
35
38
 
36
39
  default_config :image do |driver|
37
40
  driver.default_image
@@ -72,16 +75,16 @@ module Kitchen
72
75
  end
73
76
  end
74
77
 
78
+ def remote_socket?
79
+ config[:socket] ? socket_uri.scheme == 'tcp' : false
80
+ end
81
+
75
82
  protected
76
83
 
77
84
  def socket_uri
78
85
  URI.parse(config[:socket])
79
86
  end
80
87
 
81
- def remote_socket?
82
- config[:socket] ? socket_uri.scheme == 'tcp' : false
83
- end
84
-
85
88
  def docker_command(cmd, options={})
86
89
  docker = "docker"
87
90
  docker << " -H #{config[:socket]}" if config[:socket]
@@ -19,6 +19,6 @@ module Kitchen
19
19
  module Driver
20
20
 
21
21
  # Version string for Docker Kitchen driver
22
- DOCKER_VERSION = "0.11.0"
22
+ DOCKER_VERSION = "0.12.0"
23
23
  end
24
24
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-docker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.0
4
+ version: 0.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter