From c941e0105e4894e0a1fd4f4a72e9bd188003a5c1 Mon Sep 17 00:00:00 2001 From: uumas Date: Thu, 2 Dec 2021 03:34:30 +0200 Subject: [PATCH] Made docker role compatible with other architectures and ubuntu --- galaxy.yml | 2 +- roles/docker/tasks/main.yml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index fa93344..db25819 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ namespace: uumas name: docker -version: 0.2.0 +version: 0.3.0 readme: README.md repository: https://git.uumas.fi/uumas/ansible-docker license_file: LICENSE diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 9ca9cc4..f106006 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -10,13 +10,22 @@ - lsb-release update_cache: true +- name: Set dpkg arch (amd64) + set_fact: + dpkg_arch: amd64 + when: ansible_architecture == 'x86_64' +- name: Set dpkg arch (arm64) + set_fact: + dpkg_arch: arm64 + when: ansible_architecture == 'aarch64' + - name: Add docker repo signing key apt_key: id: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88' url: 'https://download.docker.com/linux/debian/gpg' - name: Add docker repo apt_repository: - repo: "deb [arch=amd64] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable" + repo: "deb [arch={{ dpkg_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable" filename: 'docker' mode: '644'