From 355bb2a6ff17fc5bf6817dd2e29cb6edf6fcfb37 Mon Sep 17 00:00:00 2001 From: Andrew Bobulsky Date: Tue, 2 Jul 2024 14:18:34 -0400 Subject: [PATCH] fix: Support docker build output for Docker Desktop v4.31 Signed-off-by: Andrew Bobulsky --- lib/kitchen/docker/helpers/image_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/kitchen/docker/helpers/image_helper.rb b/lib/kitchen/docker/helpers/image_helper.rb index e54deba..ffa0167 100644 --- a/lib/kitchen/docker/helpers/image_helper.rb +++ b/lib/kitchen/docker/helpers/image_helper.rb @@ -35,6 +35,11 @@ def parse_image_id(output) img_id = line.split(/\s+/).last return img_id end + # Docker ~v4.31 support + if line =~ /naming to moby-dangling@(sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i + img_id = line[/naming to moby-dangling@(sha256:[[:xdigit:]]{64})(?: \d*\.\ds)? done/i, 1] + return img_id + end end raise ActionFailed, "Could not parse Docker build output for image ID" end