Also use /etc/apt/keyrings instead

geerlingguy · May 26, 2024 · 63b9909 · 63b9909
1 parent 8d9379f
commit 63b9909
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -39,7 +39,7 @@ 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 '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_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_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
@@ -15,10 +15,16 @@
     state: present
   when: docker_add_repo | bool
 
+- name: Create apt keyring directory
+  file:
+    path: /etc/apt/keyrings
+    mode: "0755"
+    state: directory
+
 - name: Add Docker apt key.
   ansible.builtin.get_url:
     url: "{{ docker_apt_gpg_key }}"
-    dest: /etc/apt/trusted.gpg.d/docker.asc
+    dest: /etc/apt/keyrings/docker.asc
     mode: '0644'
     force: false
     checksum: "{{ docker_apt_gpg_key_checksum | default(omit) }}"