kitchen-dokken 2.11.1 → 2.11.2
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 +11 -3
- data/lib/kitchen/driver/dokken_version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ef0d3aea1c2839a2674ed7986dba589c8e672a19a600bdf9173689d286414160
|
4
|
+
data.tar.gz: ad29a7651abca534ff753140b67408adfa5e7a8c44252b810925a68f1ac2ca88
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e5056e47e61cd05b666a4058a0eaee09a4fa4907d331088f92ff783c41bd455cc33424ca25ac885b278270c4f8d8ebdc80cf5734d3b7363da6c4d34e1f2e74de
|
7
|
+
data.tar.gz: 50bec0744f44a44603dc887c99b3c73009eebe9c02f2832c10aecfa02bc46cea55c19d591d3d08efc409907a80139626bbf356aafbf73017872e607d65c857c9
|
@@ -153,9 +153,9 @@ module Kitchen
|
|
153
153
|
rescue Docker::Error::UnexpectedResponseError => e
|
154
154
|
msg = 'work_image build failed: '
|
155
155
|
msg += JSON.parse(e.to_s.split("\r\n").last)['error'].to_s
|
156
|
-
msg += '. The common
|
156
|
+
msg += '. The common scenarios are incorrect intermediate '
|
157
157
|
msg += 'instructions such as not including `-y` on an `apt-get` '
|
158
|
-
msg += 'or similar. The other common
|
158
|
+
msg += 'or similar. The other common scenario is a transient '
|
159
159
|
msg += 'error such as an unresponsive mirror.'
|
160
160
|
raise msg
|
161
161
|
# fallback rescue above should catch most of the errors
|
@@ -368,8 +368,16 @@ module Kitchen
|
|
368
368
|
lockfile = Lockfile.new "#{home_dir}/.dokken-#{chef_container_name}.lock"
|
369
369
|
begin
|
370
370
|
lockfile.lock
|
371
|
-
with_retries {
|
371
|
+
with_retries {
|
372
|
+
# TEMPORARY FIX - docker-api 2.0.0 has a buggy Docker::Container.get - use .all instead
|
373
|
+
# https://github.com/swipely/docker-api/issues/566
|
374
|
+
# ::Docker::Container.get(chef_container_name, {}, docker_connection)
|
375
|
+
found = ::Docker::Container.all({all: true}, docker_connection).select { |c| c.info["Names"].include?("/#{chef_container_name}") }
|
376
|
+
raise ::Docker::Error::NotFoundError.new(chef_container_name) if found.empty?
|
377
|
+
debug "Chef container already exists, continuing"
|
378
|
+
}
|
372
379
|
rescue ::Docker::Error::NotFoundError
|
380
|
+
debug "Chef container does not exist, creating a new Chef container"
|
373
381
|
with_retries do
|
374
382
|
begin
|
375
383
|
debug "driver - creating volume container #{chef_container_name} from #{chef_image}"
|
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: 2.11.
|
4
|
+
version: 2.11.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean OMeara
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-12-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: docker-api
|