From c91b732fc4c296d7af1c4c5f541bf67a38356c99 Mon Sep 17 00:00:00 2001 From: rafalp Date: Wed, 25 Jan 2023 23:12:23 +0100 Subject: [PATCH] Check for docker and docker-compose separately --- dev | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dev b/dev index 6b01be8e12..120afce2d9 100755 --- a/dev +++ b/dev @@ -45,7 +45,7 @@ wait_for_db() { # Check if user has docker-compose if [[ ! $IN_MISAGO_DOCKER = 1 ]]; then - if ! command -v docker-compose >/dev/null 2>&1; then + if ! command -v docker >/dev/null 2>&1; then error "You need to have Docker installed to use this tool." echo echo "Docker release for your system can be downloaded for free from this page:" @@ -53,6 +53,14 @@ if [[ ! $IN_MISAGO_DOCKER = 1 ]]; then echo exit 1 fi + if ! command -v docker-compose >/dev/null 2>&1; then + error "You need to have Docker Compose installed to use this tool." + echo + echo "Docker release for your system can be downloaded for free from this page:" + echo "https://www.docker.com/get-started" + echo + exit 1 + fi fi # Commands