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..9f90a11 --- /dev/null +++ b/vars/Debian.yml @@ -0,0 +1,14 @@ +--- +# 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 diff --git a/vars/RedHat.yml b/vars/RedHat.yml new file mode 100644 index 0000000..d8063fb --- /dev/null +++ b/vars/RedHat.yml @@ -0,0 +1,14 @@ +--- +# 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