From 53c487c31a70b11a45b14e917d52159a9cc688cc Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 26 Sep 2022 17:09:27 -0500
Subject: [PATCH] Fixes #290: Allow role to work on ARM64 out of the box.

---
 README.md         | 4 ++--
 defaults/main.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 94c4a80..2f23291 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Docker Compose Plugin installation options. These differ from the below in that
 
     docker_install_compose: true
     docker_compose_version: "1.26.0"
-    docker_compose_arch: x86_64
+    docker_compose_arch: "{{ ansible_architecture }}"
     docker_compose_path: /usr/local/bin/docker-compose
 
 Docker Compose installation options.
@@ -52,7 +52,7 @@ Docker Compose installation options.
 The main Docker repo URL, common between Debian and RHEL systems.
 
     docker_apt_release_channel: stable
-    docker_apt_arch: amd64
+    docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else '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_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"
diff --git a/defaults/main.yml b/defaults/main.yml
index 7e4e73b..685b8de 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -21,8 +21,8 @@ docker_compose_package_state: present
 
 # Docker Compose options.
 docker_install_compose: true
-docker_compose_version: "v2.4.1"
-docker_compose_arch: x86_64
+docker_compose_version: "v2.11.1"
+docker_compose_arch: "{{ ansible_architecture }}"
 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
 docker_compose_path: /usr/local/bin/docker-compose
 
@@ -31,7 +31,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_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else '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_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg"