Skip to content

Commit

Permalink
Remove hardcoded debian docker apt repository url in docker role
Browse files Browse the repository at this point in the history
  • Loading branch information
at3rva committed Aug 26, 2024
1 parent 8f0c773 commit 54ee88b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion nova/core/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace: nova
name: core

# The version of the collection. Must be compatible with semantic versioning
version: 3.1.17
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
Expand Down
7 changes: 5 additions & 2 deletions nova/core/roles/docker/tasks/debian_os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 54ee88b

Please sign in to comment.