From 2a7f3c9c0c338d6167d10772d8b5b9becbb5c59d Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Thu, 11 Dec 2025 18:55:33 +0000 Subject: [PATCH] Workaround kitchen-dokken Docker API compatibility issue Fixes: https://github.com/openstreetmap/chef/issues/816 --- .ruby-version | 2 +- Gemfile | 6 ++---- Gemfile.lock | 18 +++++++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.ruby-version b/.ruby-version index 23887f6eb..5f6fc5edc 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.7 +3.3.10 diff --git a/Gemfile b/Gemfile index baf310d5a..2843364d5 100644 --- 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 45f37b920..7a64fe348 100644 --- 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 -- 2.39.5