From a7d6734930055869020ad66d35d50eb60a83256f Mon Sep 17 00:00:00 2001
From: Monkey Do <salicon.petiller@gmail.com>
Date: Tue, 14 May 2024 16:47:18 +0200
Subject: [PATCH] Detect docker compose command

depending on the version of docker.

Also removes the 'version' argument in docker-compose files, which is now deprecated.
---
 develop-api.sh                  | 12 ++++++++++--
 develop.sh                      | 12 ++++++++++--
 docker-compose.api.yml          |  2 --
 docker-compose.yml              |  2 --
 scripts/database-init-docker.sh | 11 +++++++++--
 stop.sh                         | 12 ++++++++++--
 6 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/develop-api.sh b/develop-api.sh
index 571920efed..ac03082807 100755
--- a/develop-api.sh
+++ b/develop-api.sh
@@ -5,5 +5,13 @@ if [[ ! -d "src" ]]; then
     exit -1
 fi
 
-docker-compose -f docker-compose.api.yml run --rm startup &&
-docker-compose -f docker-compose.api.yml up --build bookbrainz-api
+echo "Checking docker compose version"
+if docker compose version &> /dev/null; then
+    DOCKER_COMPOSE_CMD="docker compose"
+else
+    DOCKER_COMPOSE_CMD="docker-compose"
+fi
+
+
+$DOCKER_COMPOSE_CMD -f docker-compose.api.yml run --rm startup &&
+$DOCKER_COMPOSE_CMD -f docker-compose.api.yml up --build bookbrainz-api
diff --git a/develop.sh b/develop.sh
index 75a295a7c5..5bbf8c25ec 100755
--- a/develop.sh
+++ b/develop.sh
@@ -5,5 +5,13 @@ if [[ ! -d "src" ]]; then
     exit -1
 fi
 
-docker-compose run --rm startup &&
-docker-compose up --build bookbrainz-site
+echo "Checking docker compose version"
+if docker compose version &> /dev/null; then
+    DOCKER_COMPOSE_CMD="docker compose"
+else
+    DOCKER_COMPOSE_CMD="docker-compose"
+fi
+
+
+$DOCKER_COMPOSE_CMD run --rm startup &&
+$DOCKER_COMPOSE_CMD up --build bookbrainz-site
diff --git a/docker-compose.api.yml b/docker-compose.api.yml
index d36eaa5d12..0f0d579b38 100644
--- a/docker-compose.api.yml
+++ b/docker-compose.api.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
 
   bookbrainz-api:
diff --git a/docker-compose.yml b/docker-compose.yml
index be48c02c90..4114dcd078 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
 
   bookbrainz-site:
diff --git a/scripts/database-init-docker.sh b/scripts/database-init-docker.sh
index 2463154c17..a0db48dabc 100755
--- a/scripts/database-init-docker.sh
+++ b/scripts/database-init-docker.sh
@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
 
-docker-compose build &&
-docker-compose run --rm bookbrainz-site scripts/wait-for-postgres.sh scripts/download-import-dump.sh
\ No newline at end of file
+echo "Checking docker compose version"
+if docker compose version &> /dev/null; then
+    DOCKER_COMPOSE_CMD="docker compose"
+else
+    DOCKER_COMPOSE_CMD="docker-compose"
+fi
+
+$DOCKER_COMPOSE_CMD build &&
+$DOCKER_COMPOSE_CMD run --rm bookbrainz-site scripts/wait-for-postgres.sh scripts/download-import-dump.sh
\ No newline at end of file
diff --git a/stop.sh b/stop.sh
index 291d4a83b9..fcceeca6fe 100755
--- a/stop.sh
+++ b/stop.sh
@@ -1,2 +1,10 @@
-docker-compose down
-docker-compose -f docker-compose.api.yml down
\ No newline at end of file
+echo "Checking docker compose version"
+if docker compose version &> /dev/null; then
+    DOCKER_COMPOSE_CMD="docker compose"
+else
+    DOCKER_COMPOSE_CMD="docker-compose"
+fi
+
+
+$DOCKER_COMPOSE_CMD down
+$DOCKER_COMPOSE_CMD -f docker-compose.api.yml down
\ No newline at end of file