From 73f1928162c4f915a0d58bfc2bac7c0365dd5130 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 30 Sep 2021 09:19:38 +0100
Subject: [PATCH] Run apt upgrade after modifying the docker/podman sources
---
roles/float-base-docker/tasks/podman.yml | 7 +++++++
roles/float-base-docker/tasks/podman_ai.yml | 1 +
roles/float-base-docker/tasks/podman_debian.yml | 1 +
roles/float-base-docker/tasks/podman_kubic.yml | 1 +
4 files changed, 10 insertions(+)
diff --git a/roles/float-base-docker/tasks/podman.yml b/roles/float-base-docker/tasks/podman.yml
index 9c87cbf4..e0b9f3ce 100644
--- a/roles/float-base-docker/tasks/podman.yml
+++ b/roles/float-base-docker/tasks/podman.yml
@@ -2,6 +2,13 @@
- include_tasks: "podman_{{ podman_package_source }}.yml"
+# If we've changed sources.list for podman, it is important
+# that we run apt upgrade now.
+- name: Apt upgrade
+ apt:
+ upgrade: 'yes'
+ when: "podman_sources_list.changed"
+
- name: Symlink podman to docker
file:
src: /usr/bin/podman
diff --git a/roles/float-base-docker/tasks/podman_ai.yml b/roles/float-base-docker/tasks/podman_ai.yml
index fd336685..66e2e77c 100644
--- a/roles/float-base-docker/tasks/podman_ai.yml
+++ b/roles/float-base-docker/tasks/podman_ai.yml
@@ -19,6 +19,7 @@
apt_repository:
repo: "deb [signed-by=/usr/share/keyrings/deb.autistici.org.gpg] http://deb.autistici.org/urepo buster-podman/"
state: present
+ register: podman_sources_list
- name: Pin podman packages to our repository
copy:
diff --git a/roles/float-base-docker/tasks/podman_debian.yml b/roles/float-base-docker/tasks/podman_debian.yml
index beb1ac79..ba4e212f 100644
--- a/roles/float-base-docker/tasks/podman_debian.yml
+++ b/roles/float-base-docker/tasks/podman_debian.yml
@@ -24,6 +24,7 @@
file:
path: "/etc/apt/preferences.d/99podman"
state: absent
+ register: podman_sources_list
- name: Install Podman packages
apt:
diff --git a/roles/float-base-docker/tasks/podman_kubic.yml b/roles/float-base-docker/tasks/podman_kubic.yml
index 6e66c040..ee5fd28a 100644
--- a/roles/float-base-docker/tasks/podman_kubic.yml
+++ b/roles/float-base-docker/tasks/podman_kubic.yml
@@ -18,6 +18,7 @@
apt_repository:
repo: "deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/Debian_10/ /"
state: present
+ register: podman_sources_list
- name: Remove podman package pins
file:
--
GitLab