diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 8de6997..c6420e4 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -7,9 +7,8 @@ enable_docker_repo: "{% if ansible_facts.distribution == 'openEuler' %}false{% e # Docker APT repository configuration. docker_apt_url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}" -docker_apt_repo: "deb {{ docker_apt_url }} {{ ansible_facts.distribution_release }} stable" +docker_apt_repo: "deb [signed-by=/etc/apt/keyrings/docker.asc] {{ docker_apt_url }} {{ ansible_facts.distribution_release }} stable" docker_apt_key_file: "gpg" -docker_apt_key_id: "0EBFCD88" docker_apt_package: "docker-ce" # Docker Yum repository configuration. diff --git a/roles/docker/tasks/repo-Debian.yml b/roles/docker/tasks/repo-Debian.yml index fac2656..e754c68 100644 --- a/roles/docker/tasks/repo-Debian.yml +++ b/roles/docker/tasks/repo-Debian.yml @@ -16,11 +16,19 @@ recurse: yes become: True +- name: Ensure apt keyrings directory exists + file: + path: /etc/apt/keyrings + state: directory + recurse: yes + become: True + - name: Install docker apt gpg key - apt_key: + get_url: url: "{{ docker_apt_url }}/{{ docker_apt_key_file }}" - id: "{{ docker_apt_key_id }}" - state: present + dest: "/etc/apt/keyrings/docker.asc" + mode: "0644" + force: true become: True - name: Enable docker apt repository