Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2025-08-02 13:46:22 +02:00
Code Issues Projects Releases Wiki Activity

Explictly define the pacakge repo filename.

Browse Source 
On debian-flavored systems, failure to do this means that ansible will 
generate the filename, and that filename will include many elements of 
the repository, which can include version numbers.  This means that 
after upgrading distribution versions, one will end up with multiple 
repository definitions in separate files.
This commit is contained in:
Eric Engstrom 2021-04-20 16:34:58 -05:00
parent d9361630a9
commit b2c0c24e16
No known key found for this signature in database
GPG Key ID: 9232FD58D13AAAB2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -20,11 +20,13 @@ docker_repo_url: https://download.docker.com/linux
docker_apt_release_channel: stable docker_apt_release_channel: stable
docker_apt_arch: amd64 docker_apt_arch: amd64
docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
docker_apt_repo_filename: "{{ docker_package }}"
docker_apt_ignore_key_error: true docker_apt_ignore_key_error: true
docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
# Used only for RedHat/CentOS/Fedora. # Used only for RedHat/CentOS/Fedora.
docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo" docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"
docker_yum_repo_filename: "{{ docker_package }}"
docker_yum_repo_enable_nightly: '0' docker_yum_repo_enable_nightly: '0'
docker_yum_repo_enable_test: '0' docker_yum_repo_enable_test: '0'
docker_yum_gpg_key: "{{ docker_repo_url }}/centos/gpg" docker_yum_gpg_key: "{{ docker_repo_url }}/centos/gpg"

1
tasks/setup-Debian.yml
View File

@ -47,5 +47,6 @@
- name: Add Docker repository. - name: Add Docker repository.
apt_repository: apt_repository:
repo: "{{ docker_apt_repository }}" repo: "{{ docker_apt_repository }}"
filename: "{{ docker_apt_repo_filename }}"
state: present state: present
update_cache: true update_cache: true

6
tasks/setup-RedHat.yml
View File

@ -15,14 +15,14 @@
- name: Add Docker repository. - name: Add Docker repository.
get_url: get_url:
url: "{{ docker_yum_repo_url }}" url: "{{ docker_yum_repo_url }}"
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' dest: '/etc/yum.repos.d/{{ docker_yum_repo_filename }}.repo'
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644
- name: Configure Docker Nightly repo. - name: Configure Docker Nightly repo.
ini_file: ini_file:
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' dest: '/etc/yum.repos.d/{{ docker_yum_repo_filename }}.repo'
section: 'docker-{{ docker_edition }}-nightly' section: 'docker-{{ docker_edition }}-nightly'
option: enabled option: enabled
value: '{{ docker_yum_repo_enable_nightly }}' value: '{{ docker_yum_repo_enable_nightly }}'
@ -30,7 +30,7 @@
- name: Configure Docker Test repo. - name: Configure Docker Test repo.
ini_file: ini_file:
dest: '/etc/yum.repos.d/docker-{{ docker_edition }}.repo' dest: '/etc/yum.repos.d/{{ docker_yum_repo_filename }}.repo'
section: 'docker-{{ docker_edition }}-test' section: 'docker-{{ docker_edition }}-test'
option: enabled option: enabled
value: '{{ docker_yum_repo_enable_test }}' value: '{{ docker_yum_repo_enable_test }}'