From 78dec194bd586d8480da5cc70e02e03cdb0d73eb Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Mon, 17 Feb 2025 01:21:15 +0330 Subject: [PATCH 1/3] update: docker_obsolete_packages separated for Debian and RedHat OS-Family --- README.md | 7 +++++++ defaults/main.yml | 2 ++ tasks/setup-RedHat.yml | 5 +---- vars/Debian.yml | 13 +++++++++++++ vars/RedHat.yml | 13 +++++++++++++ 5 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 vars/Debian.yml create mode 100644 vars/RedHat.yml diff --git a/README.md b/README.md index 2460145..c8dc6ee 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,18 @@ docker_obsolete_packages: - docker.io - docker-engine - docker-doc + - docker-compose + - docker-compose-v2 - podman-docker - containerd - runc ``` +`docker_obsolete_packages` for different os-family: + +- [`RedHat.yaml`](./vars/RedHat.yml) +- [`Debian.yaml`](./vars/Debian.yml) + A list of packages to be uninstalled prior to running this role. See [Docker's installation instructions](https://docs.docker.com/engine/install/debian/#uninstall-old-versions) for an up-to-date list of old packages that should be removed. ```yaml diff --git a/defaults/main.yml b/defaults/main.yml index fa13b89..fde06e5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,6 +13,8 @@ docker_obsolete_packages: - docker.io - docker-engine - docker-doc + - docker-compose + - docker-compose-v2 - podman-docker - containerd - runc diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index d49316e..8a790f6 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/Debian.yml b/vars/Debian.yml new file mode 100644 index 0000000..919eecf --- /dev/null +++ b/vars/Debian.yml @@ -0,0 +1,13 @@ +# Used only for Debian/Ubuntu (Debian OS-Family) +# https://docs.docker.com/engine/install/debian/#uninstall-old-versions + +docker_obsolete_packages: + - docker + - docker.io + - docker-engine + - docker-doc + - docker-compose + - docker-compose-v2 + - podman-docker + - containerd + - runc \ No newline at end of file diff --git a/vars/RedHat.yml b/vars/RedHat.yml new file mode 100644 index 0000000..1527d2e --- /dev/null +++ b/vars/RedHat.yml @@ -0,0 +1,13 @@ +# Used only for Fedora/Rocky (RedHat OS-Family) +# https://docs.docker.com/engine/install/fedora/#uninstall-old-versions +# https://docs.docker.com/engine/install/centos/#uninstall-old-versions + +docker_obsolete_packages: + - docker + - docker-client + - docker-client-latest + - docker-common + - docker-latest + - docker-latest-logrotate + - docker-logrotate + - docker-engine \ No newline at end of file From 04981f6af54f9aa779c805d0cc5a49cbb5dc20b5 Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Mon, 17 Feb 2025 01:24:35 +0330 Subject: [PATCH 2/3] Add: empty line at the EOF for the vars/Debian.yml,RedHat.yml --- vars/Debian.yml | 2 +- vars/RedHat.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vars/Debian.yml b/vars/Debian.yml index 919eecf..f2eabc4 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -10,4 +10,4 @@ docker_obsolete_packages: - docker-compose-v2 - podman-docker - containerd - - runc \ No newline at end of file + - runc diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 1527d2e..71d4240 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -10,4 +10,4 @@ docker_obsolete_packages: - docker-latest - docker-latest-logrotate - docker-logrotate - - docker-engine \ No newline at end of file + - docker-engine From ea27ff2acbcaed74de1db0c2b49780e87ccdac7c Mon Sep 17 00:00:00 2001 From: Ali Mehraji Date: Mon, 17 Feb 2025 02:01:42 +0330 Subject: [PATCH 3/3] update: missing document start --- into vars/Debian.yml,RedHat.yml --- vars/Debian.yml | 1 + vars/RedHat.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/vars/Debian.yml b/vars/Debian.yml index f2eabc4..9f90a11 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,3 +1,4 @@ +--- # Used only for Debian/Ubuntu (Debian OS-Family) # https://docs.docker.com/engine/install/debian/#uninstall-old-versions diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 71d4240..d8063fb 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,3 +1,4 @@ +--- # Used only for Fedora/Rocky (RedHat OS-Family) # https://docs.docker.com/engine/install/fedora/#uninstall-old-versions # https://docs.docker.com/engine/install/centos/#uninstall-old-versions