From 89cf9109e76592058c7faffab99d181d7f1c3f68 Mon Sep 17 00:00:00 2001 From: Chris Schindlbeck Date: Sat, 30 Nov 2024 20:39:05 +0100 Subject: [PATCH 1/2] Replace hardcoded list in RedHat with docker_obsolete_packages --- tasks/setup-RedHat.yml | 5 +---- vars/Fedora.yml | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100755 vars/Fedora.yml diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index d49316ef..8a790f6c 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -1,10 +1,7 @@ --- - name: Ensure old versions of Docker are not installed. package: - name: - - docker - - docker-common - - docker-engine + name: "{{ docker_obsolete_packages }}" state: absent - name: Add Docker GPG key. diff --git a/vars/Fedora.yml b/vars/Fedora.yml new file mode 100755 index 00000000..e08919c6 --- /dev/null +++ b/vars/Fedora.yml @@ -0,0 +1,15 @@ +--- +docker_install_compose_plugin: false +docker_obsolete_packages: + - docker + - docker.io + - docker-engine + - podman-docker + - containerd + - runc + # - docker + # - docker-compose + # - docker-compose-plugin + # - docker-ce + # - docker-ce-cli + # - docker-ce-rootless-extras From 67c840be318e25d72939e44ca688b22acb5529ca Mon Sep 17 00:00:00 2001 From: Chris Schindlbeck Date: Sun, 1 Dec 2024 07:21:43 +0100 Subject: [PATCH 2/2] Update Fedora.yml --- vars/Fedora.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vars/Fedora.yml b/vars/Fedora.yml index e08919c6..4631e191 100755 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -2,11 +2,8 @@ docker_install_compose_plugin: false docker_obsolete_packages: - docker - - docker.io - docker-engine - - podman-docker - - containerd - - runc + - docker-common # - docker # - docker-compose # - docker-compose-plugin