From 5e70695ea22bff667aee5e6851ea6b2815bf97d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20S=C3=A1nchez?= Date: Mon, 16 Dec 2024 14:31:21 +0100 Subject: [PATCH] Fix the error to detect `docker compose` Removed the function and simplify the process --- scripts/run.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/scripts/run.sh b/scripts/run.sh index af604a5d..c0a18a69 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -1,20 +1,16 @@ #!/usr/bin/env bash -command_exists() { - command -v "$1" >/dev/null 2>&1 -} - -# Check if 'docker compose' is available (with space) -if command_exists "docker compose"; then +# Check if 'docker compose' is available +if docker compose version >/dev/null 2>&1; then DOCKER_COMPOSE_CMD="docker compose" +elif docker-compose version >/dev/null 2>&1; then + # Fallback to 'docker-compose' if 'docker compose' is not available + DOCKER_COMPOSE_CMD="docker-compose" else - # Check if 'docker-compose' is available - if command_exists docker-compose; then - DOCKER_COMPOSE_CMD="docker-compose" - else - echo "Error: Neither 'docker-compose' nor 'docker compose' is available. Please install Docker Compose." - exit 1 - fi + echo "Error: Neither 'docker-compose' nor 'docker compose' is available. Please install Docker Compose." + exit 1 fi +# Run the Docker Compose command with any passed arguments $DOCKER_COMPOSE_CMD up "${@:1}" +