kitchen-dokken 0.0.13 → 0.0.14
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/dokken.rb +6 -6
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- data/lib/kitchen/transport/dokken.rb +8 -8
- 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: 281a9d81aca687090ac3b3a3f3751eb2ecbe954a
|
4
|
+
data.tar.gz: 852aa96acd876d19e13e8d820f5f0a937ad24b85
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2b07def8cc14a9ce8e23eb9abaccc0551b2ae82af4a65df82e58adce84cf23ce90ae53b51576036f19963642e4b61fedaf2c6d93dc9a3d1d3507023a33d6cce7
|
7
|
+
data.tar.gz: c18f97870cd8f9d02eb5c81f6c72f4b64865c9683a8794cb7ef6ee98174b0fbc6bf0dd4d6d1d9087be3217db5958857b87514dc4f396f30c60d8568a08cc2746
|
@@ -97,13 +97,13 @@ module Kitchen
|
|
97
97
|
|
98
98
|
with_retries do
|
99
99
|
begin
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
100
|
+
@work_image = Docker::Image.build_from_dir(
|
101
|
+
context_root,
|
102
|
+
{ 'nocache' => true, 'rm' => true },
|
103
|
+
docker_connection
|
104
|
+
)
|
105
105
|
rescue
|
106
|
-
|
106
|
+
debug "work_image build failed. retrying."
|
107
107
|
end
|
108
108
|
end
|
109
109
|
|
@@ -74,14 +74,14 @@ module Kitchen
|
|
74
74
|
end
|
75
75
|
|
76
76
|
begin
|
77
|
-
old_image = Docker::Image.get(work_image, {}, docker_connection)
|
78
|
-
with_retries { old_image.remove }
|
77
|
+
@old_image = Docker::Image.get(work_image, {}, docker_connection)
|
78
|
+
with_retries { @old_image.remove }
|
79
79
|
rescue
|
80
80
|
debug "#{work_image} not present. nothing to remove."
|
81
81
|
end
|
82
82
|
|
83
|
-
new_image = @runner.commit
|
84
|
-
new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true')
|
83
|
+
@new_image = @runner.commit
|
84
|
+
with_retries { @new_image.tag('repo' => work_image, 'tag' => 'latest', 'force' => 'true') }
|
85
85
|
end
|
86
86
|
|
87
87
|
def upload(locals, remote)
|
@@ -143,14 +143,14 @@ module Kitchen
|
|
143
143
|
block.call
|
144
144
|
# Only catch errors that can be fixed with retries.
|
145
145
|
rescue Docker::Error::ServerError, # 404
|
146
|
-
|
147
|
-
|
148
|
-
|
146
|
+
Docker::Error::UnexpectedResponseError, # 400
|
147
|
+
Docker::Error::TimeoutError,
|
148
|
+
Docker::Error::IOError => e
|
149
149
|
tries -= 1
|
150
150
|
retry if tries > 0
|
151
151
|
raise e
|
152
152
|
end
|
153
|
-
end
|
153
|
+
end
|
154
154
|
end
|
155
155
|
|
156
156
|
private
|