From a22bc80044bb937b3a702255a26dd9f9a60e852c Mon Sep 17 00:00:00 2001 From: at3rva Date: Mon, 12 Aug 2024 14:06:18 +0200 Subject: [PATCH] Remove hardcoded debian docker apt repository url in `docker` role --- nova/core/galaxy.yml | 2 +- nova/core/roles/docker/tasks/debian_os.yml | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nova/core/galaxy.yml b/nova/core/galaxy.yml index 71ae1ad8..484dd835 100644 --- a/nova/core/galaxy.yml +++ b/nova/core/galaxy.yml @@ -8,7 +8,7 @@ namespace: nova name: core # The version of the collection. Must be compatible with semantic versioning -version: 3.1.18 +version: 3.1.19 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/nova/core/roles/docker/tasks/debian_os.yml b/nova/core/roles/docker/tasks/debian_os.yml index 9622f913..b8a422e1 100644 --- a/nova/core/roles/docker/tasks/debian_os.yml +++ b/nova/core/roles/docker/tasks/debian_os.yml @@ -15,13 +15,16 @@ block: - name: Adding Docker GPG apt key... ansible.builtin.apt_key: - url: https://download.docker.com/linux/debian/gpg + url: "{{ docker_apt_proxy }}/gpg" keyring: /etc/apt/trusted.gpg.d/docker.gpg state: present register: docker_apt_key until: not docker_apt_key.failed # Because sometimes the primary DNS is not up yet or egress FW is still being deployed retries: 10 delay: 6 + vars: + # Overriding ansible_distribution to match Debian because Kali does not have it's own Docker repository + ansible_distribution: debian # This is to remove the legacy Docker repository filename that was previously used with this role # This task should be removed on 01.09.2024 @@ -47,7 +50,7 @@ block: - name: Adding Docker GPG apt key... ansible.builtin.apt_key: - url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg + url: "{{ docker_apt_proxy }}/gpg" keyring: /etc/apt/trusted.gpg.d/docker.gpg state: present register: docker_apt_key