kitchen-dokken 2.2.2 → 2.2.3
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/CHANGELOG.md +3 -0
- data/lib/kitchen/driver/dokken.rb +8 -4
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- data/lib/kitchen/helpers.rb +5 -5
- data/lib/kitchen/transport/dokken.rb +2 -2
- 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: ee6436b7ffb1c6900e881ac88e7c6c9ee193a35b
|
|
4
|
+
data.tar.gz: 7d2146ac76c4c773f664ccc89662f1d43fd34408
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1bb9a600392ff422bf25caaabaf235861a65ef150075bf2c87bb823fdd768c47a56e263cdb5379d46f6bf9f1bec725085fcac549949c9e2c7e9144cfc68f3765
|
|
7
|
+
data.tar.gz: dd3093f15147c00fe18d7c4b2010b7776bbd86ccce70ea2c1402cfae41408162b418d4849460ba41194cea29fdf801878aea090e0ce5af672e0a8cac55f42eca
|
data/CHANGELOG.md
CHANGED
|
@@ -62,7 +62,7 @@ module Kitchen
|
|
|
62
62
|
|
|
63
63
|
# network
|
|
64
64
|
make_dokken_network
|
|
65
|
-
|
|
65
|
+
|
|
66
66
|
# chef
|
|
67
67
|
pull_chef_image
|
|
68
68
|
create_chef_container state
|
|
@@ -296,9 +296,13 @@ module Kitchen
|
|
|
296
296
|
|
|
297
297
|
def make_dokken_network
|
|
298
298
|
debug 'driver - creating dokken network'
|
|
299
|
-
Docker::Network.
|
|
300
|
-
rescue
|
|
301
|
-
|
|
299
|
+
::Docker::Network.get('dokken', {}, docker_connection)
|
|
300
|
+
rescue
|
|
301
|
+
begin
|
|
302
|
+
Docker::Network.create('dokken', {})
|
|
303
|
+
rescue ::Docker::Error => e
|
|
304
|
+
debug "driver - :#{e}:"
|
|
305
|
+
end
|
|
302
306
|
end
|
|
303
307
|
|
|
304
308
|
def make_data_image
|
data/lib/kitchen/helpers.rb
CHANGED
|
@@ -95,11 +95,11 @@ EOF
|
|
|
95
95
|
def dokken_create_sandbox
|
|
96
96
|
info("Creating kitchen sandbox at #{dokken_kitchen_sandbox}")
|
|
97
97
|
FileUtils.mkdir_p(dokken_kitchen_sandbox)
|
|
98
|
-
File.chmod(
|
|
98
|
+
File.chmod(0o755, dokken_kitchen_sandbox)
|
|
99
99
|
|
|
100
100
|
info("Creating verifier sandbox at #{dokken_verifier_sandbox}")
|
|
101
101
|
FileUtils.mkdir_p(dokken_verifier_sandbox)
|
|
102
|
-
File.chmod(
|
|
102
|
+
File.chmod(0o755, dokken_verifier_sandbox)
|
|
103
103
|
end
|
|
104
104
|
|
|
105
105
|
def dokken_delete_sandbox
|
|
@@ -159,7 +159,7 @@ EOF
|
|
|
159
159
|
info("Creating kitchen sandbox in #{sandbox_path}")
|
|
160
160
|
unless ::Dir.exist?(sandbox_path)
|
|
161
161
|
FileUtils.mkdir_p(sandbox_path)
|
|
162
|
-
File.chmod(
|
|
162
|
+
File.chmod(0o755, sandbox_path)
|
|
163
163
|
end
|
|
164
164
|
end
|
|
165
165
|
end
|
|
@@ -171,7 +171,7 @@ module Kitchen
|
|
|
171
171
|
def create_sandbox
|
|
172
172
|
info("Creating kitchen sandbox in #{sandbox_path}")
|
|
173
173
|
FileUtils.mkdir_p(sandbox_path)
|
|
174
|
-
File.chmod(
|
|
174
|
+
File.chmod(0o755, sandbox_path)
|
|
175
175
|
end
|
|
176
176
|
|
|
177
177
|
# this MUST be named 'sandbox_path' because ruby.
|
|
@@ -194,7 +194,7 @@ module Kitchen
|
|
|
194
194
|
info("Creating kitchen sandbox in #{sandbox_path}")
|
|
195
195
|
unless ::Dir.exist?(sandbox_path)
|
|
196
196
|
FileUtils.mkdir_p(sandbox_path)
|
|
197
|
-
File.chmod(
|
|
197
|
+
File.chmod(0o755, sandbox_path)
|
|
198
198
|
end
|
|
199
199
|
end
|
|
200
200
|
|
|
@@ -97,11 +97,11 @@ module Kitchen
|
|
|
97
97
|
end
|
|
98
98
|
|
|
99
99
|
tmpdir = Dir.tmpdir + '/dokken/'
|
|
100
|
-
FileUtils.mkdir_p tmpdir.to_s, mode:
|
|
100
|
+
FileUtils.mkdir_p tmpdir.to_s, mode: 0o777
|
|
101
101
|
tmpdir += Process.uid.to_s
|
|
102
102
|
FileUtils.mkdir_p tmpdir.to_s
|
|
103
103
|
File.write("#{tmpdir}/id_rsa", insecure_ssh_private_key)
|
|
104
|
-
FileUtils.chmod(
|
|
104
|
+
FileUtils.chmod(0o600, "#{tmpdir}/id_rsa")
|
|
105
105
|
|
|
106
106
|
begin
|
|
107
107
|
rsync_cmd = '/usr/bin/rsync -a -e'
|