diff --git a/docs/docker.md b/docs/docker.md index 4cfcb7fe260e5c6c75099e5a09c0d730f1de5b8b..b5de70274c4beed42cfd0f0644f99b0401ac401d 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -97,3 +97,9 @@ Adding extra options to pass to the docker daemon: ## This string should be exactly as you wish it to appear. docker_options: "" ``` + +For Debian based distributions, set the path to store the GPG key to avoid using the default one used in `apt_key` module (e.g. /etc/apt/trusted.gpg) + +```yaml +docker_repo_key_keyring: /etc/apt/trusted.gpg.d/docker.gpg +``` diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index 91227f91e79328169e156d4c484771f7860a3da9..e537558c34b2c094074ff2faa53ddfbe2390ffe6 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -5,6 +5,9 @@ docker_cli_version: "{{ docker_version }}" docker_package_info: pkgs: +# Path where to store repo key +# docker_repo_key_keyring: /etc/apt/trusted.gpg.d/docker.gpg + docker_repo_key_info: repo_keys: diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml index cf81ce2b1a67c8fa73a870d89236137d1bedb0e8..1fc490b12e52af5858896e1ff98a3a533f620476 100644 --- a/roles/container-engine/docker/tasks/main.yml +++ b/roles/container-engine/docker/tasks/main.yml @@ -57,6 +57,7 @@ apt_key: id: "{{ item }}" url: "{{ docker_repo_key_info.url }}" + keyring: "{{ docker_repo_key_keyring|default(omit) }}" state: present register: keyserver_task_result until: keyserver_task_result is succeeded diff --git a/tests/files/packet_debian12-docker.yml b/tests/files/packet_debian12-docker.yml index 5d4ac539f24cc3e5437b83b2f76121be61721b1e..2a740610347cc802cc6dda2ef3b80e5eceff9c42 100644 --- a/tests/files/packet_debian12-docker.yml +++ b/tests/files/packet_debian12-docker.yml @@ -7,3 +7,4 @@ mode: default container_manager: docker etcd_deployment_type: docker resolvconf_mode: docker_dns +docker_repo_key_keyring: /etc/apt/trusted.gpg.d/docker.gpg diff --git a/tests/files/packet_ubuntu22-aio-docker.yml b/tests/files/packet_ubuntu22-aio-docker.yml index b78c6b0a47373375ae9c9f47d7cda23db716cc80..d0f9e70dca7c4c7d2d7bb16aebc649012806b590 100644 --- a/tests/files/packet_ubuntu22-aio-docker.yml +++ b/tests/files/packet_ubuntu22-aio-docker.yml @@ -15,3 +15,4 @@ enable_nodelocaldns: False container_manager: docker etcd_deployment_type: docker resolvconf_mode: docker_dns +docker_repo_key_keyring: /etc/apt/trusted.gpg.d/docker.gpg