From 95d13bf2b88f78f502998154b11e0d87af72255e Mon Sep 17 00:00:00 2001 From: Rob Petti Date: Mon, 25 Sep 2023 12:59:01 -0600 Subject: [PATCH 1/5] remove runc, as it conflicts with containerd --- tasks/setup-RedHat.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index ad337c40..d49316ef 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -44,6 +44,11 @@ - name: Configure containerd on RHEL 8. block: + - name: Ensure runc is not installed. + package: + name: runc + state: absent + - name: Ensure container-selinux is installed. package: name: container-selinux From 024cec565929174523a23fbdee19caa6f8d93ca1 Mon Sep 17 00:00:00 2001 From: Aram Akhavan Date: Fri, 29 Sep 2023 11:33:11 -0700 Subject: [PATCH 2/5] Update documentation about docker_apt_filename --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c854828..a6616002 100644 --- a/README.md +++ b/README.md @@ -60,12 +60,12 @@ The main Docker repo URL, common between Debian and RHEL systems. docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: True docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" - docker_apt_filename: "" + docker_apt_filename: "docker" (Used only for Debian/Ubuntu.) You can switch the channel to `nightly` if you want to use the Nightly release. You can change `docker_apt_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. -Usually in combination with changing `docker_apt_repository` as well. +Usually in combination with changing `docker_apt_repository` as well. `docker_apt_filename` controls the name of the source list file created in `sources.list.d`. If you are upgrading from an older (<7.0.0) version of this role, you should change this to the name of the existing file (e.g. `` on Debian) to avoid conflicting lists. docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"docker_edition }}.repo docker_yum_repo_enable_nightly: '0' From 2b2f6e21000a56f53a3c6c2edc01c33d115c4d1f Mon Sep 17 00:00:00 2001 From: Aram Akhavan Date: Fri, 29 Sep 2023 11:35:36 -0700 Subject: [PATCH 3/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6616002..3449e28b 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ The main Docker repo URL, common between Debian and RHEL systems. (Used only for Debian/Ubuntu.) You can switch the channel to `nightly` if you want to use the Nightly release. You can change `docker_apt_gpg_key` to a different url if you are behind a firewall or provide a trustworthy mirror. -Usually in combination with changing `docker_apt_repository` as well. `docker_apt_filename` controls the name of the source list file created in `sources.list.d`. If you are upgrading from an older (<7.0.0) version of this role, you should change this to the name of the existing file (e.g. `` on Debian) to avoid conflicting lists. +Usually in combination with changing `docker_apt_repository` as well. `docker_apt_filename` controls the name of the source list file created in `sources.list.d`. If you are upgrading from an older (<7.0.0) version of this role, you should change this to the name of the existing file (e.g. `download_docker_com_linux_debian` on Debian) to avoid conflicting lists. docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"docker_edition }}.repo docker_yum_repo_enable_nightly: '0' From cd9bf6fdf8d73d857a075747649a75806c26a276 Mon Sep 17 00:00:00 2001 From: TAKAHASHI Shuuji Date: Mon, 2 Oct 2023 23:21:41 +0900 Subject: [PATCH 4/5] fix: fix failure for the initial gpg key load on Pop!_OS --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 6509732b..8deef246 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -40,7 +40,7 @@ docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_distribution in ['Pop!_ docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true -docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" +docker_apt_gpg_key: "{{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }}/gpg" docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570" docker_apt_filename: "docker" From a76a05024a200df6ab301aa34efe633db31e81c6 Mon Sep 17 00:00:00 2001 From: Yethal <26117918+Yethal@users.noreply.github.com> Date: Fri, 10 Nov 2023 16:20:54 +0100 Subject: [PATCH 5/5] Uninstall docker.io on apt distros --- tasks/setup-Debian.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 846e796b..69529bab 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -3,6 +3,7 @@ package: name: - docker + - docker.io - docker-engine state: absent