From ffa0515cd6cf3f73b4e5dcd41d00bf6014ebe699 Mon Sep 17 00:00:00 2001 From: Justin Moy Date: Mon, 12 Sep 2022 15:01:33 +0100 Subject: [PATCH] Fix installation of docker-compose on armv7l --- .gitignore | 3 +++ scripts/configure.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac6e25da..5f7a525f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +*.swo +*.swp + .pnpm-debug.log .env* github.secrets diff --git a/scripts/configure.sh b/scripts/configure.sh index 1da980ac..148cbfb5 100755 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -113,8 +113,12 @@ else fi fi -if ! command -v docker-compose >/dev/null; then - sudo curl -L "https://github.com/docker/compose/releases/download/v2.3.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +if ! docker-compose --version >/dev/null; then + arch="$(uname -m)" + if [[ "$arch" == "armv7l" ]]; then + arch="armv7" + fi + sudo curl -L "https://github.com/docker/compose/releases/download/v2.3.4/docker-compose-$(uname -s)-${arch}" -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose fi