kitchen-dokken 1.0.6 → 1.0.7
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 +4 -4
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- data/lib/kitchen/transport/dokken.rb +9 -4
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bdb135089efdc7ad91441b5dfac4b8548a8edfeb
|
|
4
|
+
data.tar.gz: f54b3849ef6cf18e572a0de2dfb4a1220646af79
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a849423a7198641c8b62bea721954e75ab8dac6c2b5913c2bcdaefc5d0dc231f934fb73c50d0f8e8c4cbf57a395ab9051dcfeba53c81f97f3ceedf0292cd1d0b
|
|
7
|
+
data.tar.gz: 0f814b40fc8d203b1ec09c5b2181eaf90eebcf0d5538a96829ac0807ea1e035048e60d380f2c3980d04af2bb62917fb597bc91c268a020ff0a031948bba97933
|
|
@@ -84,20 +84,25 @@ module Kitchen
|
|
|
84
84
|
end
|
|
85
85
|
|
|
86
86
|
def upload(locals, remote)
|
|
87
|
+
port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
|
|
88
|
+
|
|
87
89
|
if options[:host_ip_override]
|
|
88
90
|
# Allow connecting to any ip/hostname to support sibling containers
|
|
89
91
|
ip = options[:host_ip_override]
|
|
90
92
|
elsif options[:docker_host_url] =~ /unix:/
|
|
91
|
-
|
|
92
|
-
|
|
93
|
+
if options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp] = '0.0.0.0'
|
|
94
|
+
ip = options[:data_container][:NetworkSettings][:IPAddress]
|
|
95
|
+
port = '22'
|
|
96
|
+
else
|
|
97
|
+
# we should read the proper mapped ip, since this allows us to upload the files
|
|
98
|
+
ip = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostIp]
|
|
99
|
+
end
|
|
93
100
|
elsif options[:docker_host_url] =~ /tcp:/
|
|
94
101
|
ip = options[:docker_host_url].split('tcp://')[1].split(':')[0]
|
|
95
102
|
else
|
|
96
103
|
raise Kitchen::UserError, 'docker_host_url must be tcp:// or unix://'
|
|
97
104
|
end
|
|
98
105
|
|
|
99
|
-
port = options[:data_container][:NetworkSettings][:Ports][:"22/tcp"][0][:HostPort]
|
|
100
|
-
|
|
101
106
|
tmpdir = Dir.tmpdir
|
|
102
107
|
FileUtils.mkdir_p "#{tmpdir}/dokken"
|
|
103
108
|
File.write("#{tmpdir}/dokken/id_rsa", insecure_ssh_private_key)
|
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: 1.0.
|
|
4
|
+
version: 1.0.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean OMeara
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-11-
|
|
11
|
+
date: 2016-11-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|
|
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
73
73
|
version: '0'
|
|
74
74
|
requirements: []
|
|
75
75
|
rubyforge_project:
|
|
76
|
-
rubygems_version: 2.6.
|
|
76
|
+
rubygems_version: 2.6.8
|
|
77
77
|
signing_key:
|
|
78
78
|
specification_version: 4
|
|
79
79
|
summary: A Test Kitchen Driver that talks to the Docker Remote API and uses Volumes
|