From 99305cb69970af656d5d22aea3fba49e5f8bdc24 Mon Sep 17 00:00:00 2001 From: Chris Schindlbeck Date: Wed, 3 Jul 2024 10:27:21 +0200 Subject: [PATCH] Remove deprecated key path from sources.list.d/docker --- defaults/main.yml | 5 ++++- tasks/setup-Debian.yml | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7449b5b..a456151 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -46,7 +46,10 @@ docker_apt_release_channel: stable # and is only necessary until Docker officially supports them. docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_distribution in ['Pop!_OS', 'Linux Mint'] else ansible_distribution }}" docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'armhf' if ansible_architecture == 'armv7l' else 'amd64' }}" -docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/keyrings/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_gpg_key_path: '/etc/apt/keyrings' +docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by={{ docker_gpg_key_path }}/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_gpg_key_path_deprecated: '/etc/apt/trusted.gpg.d' +docker_apt_repository_deprecated: "deb [arch={{ docker_apt_arch }} signed-by={{ docker_gpg_key_path_deprecated }}/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 }}/{{ docker_apt_ansible_distribution | lower }}/gpg" docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index a864b3f..00f252d 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -1,4 +1,12 @@ --- +- name: Remove deprecated Docker repository. + apt_repository: + repo: "{{ docker_apt_repository_deprecated }}" + state: absent + filename: "{{ docker_apt_filename }}" + update_cache: true + when: docker_add_repo | bool + - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions name: Ensure old versions of Docker are not installed. package: