infrastructure/ansible-role-docker
1
0
Fork 0
mirror of https://github.com/Maks1mS/ansible-role-docker.git synced 2024-12-24 00:33:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "automatic architecture detection"

Browse Source 
This reverts commit 32129135d7.
This commit is contained in:
Julian Euler 2022-01-26 17:34:10 +01:00
parent bfba781af0
commit c9e77fb0cf
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
defaults/main.yml
View File

@ -20,7 +20,8 @@ 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_repository: "deb [arch={{ docker_apt_arch.stdout }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" 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_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"

7
tasks/setup-Debian.yml
View File

@ -44,13 +44,6 @@
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 }}"