Merge pull request #1089 from metabrainz/docker-compose

Updates for Docker compose v2
metabrainz · May 14, 2024 · e6c2111 · e6c2111
2 parents 0f56759 + a7d6734
commit e6c2111
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,3 @@
-version: '3.4'
-
 services:
 
   bookbrainz-api:

diff --git 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
@@ -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
+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
diff --git a/stop.sh b/stop.sh
@@ -1,2 +1,10 @@
-docker-compose down
-docker-compose -f docker-compose.api.yml down
+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