From 8f22bd0b3e233f06b1057c849f75f3056238bdff Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 4 Jan 2025 21:59:26 +0100
Subject: [PATCH] Do not install our storage.conf with podman v5
---
roles/float-base-docker/tasks/podman.yml | 3 ++-
roles/float-base-docker/vars/podman.yml | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/roles/float-base-docker/tasks/podman.yml b/roles/float-base-docker/tasks/podman.yml
index 3168e9f2..46112058 100644
--- a/roles/float-base-docker/tasks/podman.yml
+++ b/roles/float-base-docker/tasks/podman.yml
@@ -17,7 +17,7 @@
# Try to detect which podman version we're on based on source and
# distribution.
- set_fact:
- podman_version: "{{ 3 if float_debian_dist in ('buster', 'bullseye') else 4 }}"
+ podman_version: "{{ podman_version_by_distro[float_debian_dist] }}"
when: "podman_package_source == 'debian'"
- set_fact:
podman_version: 4
@@ -46,6 +46,7 @@
copy:
src: storage.conf
dest: "/etc/containers/storage.conf"
+ when: "podman_version < 5"
- file:
path: "/etc/containers/certs.d"
diff --git a/roles/float-base-docker/vars/podman.yml b/roles/float-base-docker/vars/podman.yml
index 44168710..25cee186 100644
--- a/roles/float-base-docker/vars/podman.yml
+++ b/roles/float-base-docker/vars/podman.yml
@@ -3,3 +3,9 @@
podman_default_package_source_by_distro:
stretch: ai
buster: ai
+
+podman_version_by_distro:
+ buster: 3
+ bullseye: 3
+ bookworm: 4
+ trixie: 5
--
GitLab