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 +4 -4
- data/lib/kitchen/driver/docker.rb +13 -10
- data/lib/kitchen/driver/docker_version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 020ed1c5e1d45078dd7a156fd22d8218f60cfc48
|
4
|
+
data.tar.gz: 8b0fcd6623219491a98f814cc8567b07341dcce2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
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 :
|
30
|
-
default_config :
|
31
|
-
default_config :
|
32
|
-
default_config :
|
33
|
-
default_config :
|
34
|
-
|
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]
|