Workaround kitchen-dokken Docker API compatibility issue

Fixes: https://github.com/openstreetmap/chef/issues/816

diff --git a/.ruby-version b/.ruby-version
index 23887f6eba2babacfd3cb0171be2f89c3997a785..5f6fc5edc2f9850e0cd2dcae63959e206d450051 100644 (file)
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.7
+3.3.10

diff --git a/Gemfile b/Gemfile
index baf310d5a8824a3d7cefbcb904015fec9a97399d..2843364d557f78d5d56bd59ada032870dd4c1e8d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,7 @@
 source "https://rubygems.org"
 
 gem "cookstyle"
-gem "kitchen-dokken"
+# Workaround https://github.com/test-kitchen/kitchen-dokken/issues/367
+gem "kitchen-dokken", :github => "feld/kitchen-dokken", :ref => "ee46cc63e3d337cc4cfcd046e52562067895f3e7"
 gem "kitchen-inspec"
 gem "test-kitchen"
-
-# Lock some modules to old versions for ruby 3.1 support
-gem "zeitwerk", "< 2.7"

diff --git a/Gemfile.lock b/Gemfile.lock
index 45f37b92073e966d21227661d8b6ed38e3f57df5..7a64fe348ac3d80c7558363fba8757a41d9bd553 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/feld/kitchen-dokken.git
+  revision: ee46cc63e3d337cc4cfcd046e52562067895f3e7
+  ref: ee46cc63e3d337cc4cfcd046e52562067895f3e7
+  specs:
+    kitchen-dokken (2.21.2)
+      docker-api (>= 1.33, < 3)
+      lockfile (~> 2.1)
+      test-kitchen (>= 1.15, < 4)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -413,10 +423,6 @@ GEM
     json (2.17.1)
     jwt (2.10.1)
       base64
-    kitchen-dokken (2.20.8)
-      docker-api (>= 1.33, < 3)
-      lockfile (~> 2.1)
-      test-kitchen (>= 1.15, < 4)
     kitchen-inspec (3.0.0)
       hashie (>= 3.4, <= 5.0)
       inspec (>= 2.2.64, < 7.0)
@@ -731,7 +737,6 @@ GEM
       rubyzip (~> 2.0)
       winrm (~> 2.0)
     wisper (2.0.1)
-    zeitwerk (2.6.18)
 
 PLATFORMS
   aarch64-linux-gnu
@@ -748,10 +753,9 @@ PLATFORMS
 
 DEPENDENCIES
   cookstyle
-  kitchen-dokken
+  kitchen-dokken!
   kitchen-inspec
   test-kitchen
-  zeitwerk (< 2.7)
 
 BUNDLED WITH
    2.6.9