automatic architecture detection

This commit is contained in:
Julian Euler 2022-01-26 17:25:04 +01:00
parent e622cbda44
commit 32129135d7
2 changed files with 8 additions and 2 deletions

View File

@ -20,8 +20,7 @@ docker_repo_url: https://download.docker.com/linux
# Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed. # Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed.
docker_apt_release_channel: stable docker_apt_release_channel: stable
docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch.stdout }}] {{ 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_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"

View File

@ -44,6 +44,13 @@
warn: false warn: false
when: add_repository_key is failed when: add_repository_key is failed
- name: Get DEB architecture
shell: dpkg --print-architecture
register: docker_apt_arch
check_mode: false
changed_when: false
failed_when: false
- name: Add Docker repository. - name: Add Docker repository.
apt_repository: apt_repository:
repo: "{{ docker_apt_repository }}" repo: "{{ docker_apt_repository }}"