From 263cd51e30027fc4db4dac8b6194d118a55b03e0 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Apr 2024 17:01:51 +0100
Subject: [PATCH 1/2] Rename kitchen.yml to match recommended name

https://kitchen.ci/docs/getting-started/kitchen-yml/
---
 .kitchen.yml => kitchen.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .kitchen.yml => kitchen.yml (100%)

diff --git a/.kitchen.yml b/kitchen.yml
similarity index 100%
rename from .kitchen.yml
rename to kitchen.yml

From dc2d2d125104f078585b555356fedd65b1d97c70 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Apr 2024 19:08:02 +0100
Subject: [PATCH 2/2] Add support for using podman to run tests

---
 kitchen.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/kitchen.yml b/kitchen.yml
index f4a55180f..b5c453e32 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -1,6 +1,13 @@
+<%
+podman_host = "/run/user/#{Process.uid}/podman/podman.sock"
+podman = File.socket?(podman_host) && !File.socket?("/run/docker.sock")
+%>
 ---
 driver:
   name: dokken
+<% if podman %>
+  docker_host_url: unix://<%= podman_host %>
+<% end %>
   chef_version: 18
   volumes:
     - /var/lib/docker
@@ -16,9 +23,16 @@ driver:
 
 transport:
   name: dokken
+<% if podman %>
+  docker_host_url: unix://<%= podman_host %>
+  login_command: podman
+<% end %>
 
 provisioner:
   name: dokken
+<% if podman %>
+  docker_host_url: unix://<%= podman_host %>
+<% end %>
   chef_license: accept
   data_bags_path: test/data_bags
   slow_resource_report: true
@@ -29,6 +43,15 @@ verifier:
   root_path: /opt/verifier
   sudo: false
 
+<% if podman %>
+lifecycle:
+  pre_create:
+    - podman create --name chef-18 --replace docker.io/chef/chef:18 sh
+    - podman start chef-18
+  post_destroy:
+    - podman volume prune -f
+<% end %>
+
 platforms:
   - name: ubuntu-20.04
     driver: