From 32129135d78d9f957815ba07d5add28cc64c5a06 Mon Sep 17 00:00:00 2001 From: Julian Euler Date: Wed, 26 Jan 2022 17:25:04 +0100 Subject: [PATCH] automatic architecture detection --- defaults/main.yml | 3 +-- tasks/setup-Debian.yml | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1b9de37..d75b81f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -20,8 +20,7 @@ docker_repo_url: https://download.docker.com/linux # Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed. docker_apt_release_channel: stable -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.stdout }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index cc444ca..bce94fe 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -44,6 +44,13 @@ warn: false 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. apt_repository: repo: "{{ docker_apt_repository }}"