Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-07-28 13:46:36 +02:00
Code Issues Projects Releases Wiki Activity

Remove deprecated key path from sources.list.d/docker

Browse Source
This commit is contained in:
Chris Schindlbeck 2024-07-03 10:27:21 +02:00
parent ee3bb23578
commit 99305cb699
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -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"

8
tasks/setup-Debian.yml
View File

@ -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: