fix: Change docker-compose to docker compose to fix CI (#4830)

* fix: Globally change docker-compose to docker compose to fix CI Signed-off-by: Jeff Thompson <jeff@thefirst.org> * fix: Already checked for docker. We're not using docker-compose. Signed-off-by: Jeff Thompson <jeff@thefirst.org> --------- Signed-off-by: Jeff Thompson <jeff@thefirst.org>
berty · Apr 5, 2024 · 0de05b0 · 0de05b0
1 parent e5c210e
commit 0de05b0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 38 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -30,7 +30,7 @@ on:
 
 # FIXME:
 # * test on production periodically with env=production
-# * test against a fresh docker-compose infra on each commit
+# * test against a fresh docker compose infra on each commit
 # * store performance logs for comparison
 
 jobs:
@@ -111,7 +111,7 @@ jobs:
 
       - name: Build Docker images
         working-directory: tool/integration-compose
-        run: docker-compose build
+        run: docker compose build
 
       - name: Run integration test suite
         working-directory: tool/integration-compose

diff --git a/tool/berty-mini/cluster/commander b/tool/berty-mini/cluster/commander
@@ -9,23 +9,19 @@ if ! [ -x "$(command -v docker)" ]; then
     echo "Error: 'docker' is not installed." >&2
     exit 1
 fi
-if ! [ -x "$(command -v docker-compose)" ]; then
-    echo "Error: 'docker-compose' is not installed." >&2
-    exit 1
-fi
 
 # init env
 if [ ! -f .env ]; then
     echo "GRP_KEY=`berty groupinit`" > .env
 fi
 
-# cleanup and warm up docker-compose before starting
+# cleanup and warm up docker compose before starting
 docker network rm $(docker network ls | grep berty-mini-cluster | awk '{print $1}') 2>/dev/null
-docker-compose up --no-start
+docker compose up --no-start
 
 # cleanup
 function cleanup {
-    docker-compose down >/dev/null 2>/dev/null
+    docker compose down >/dev/null 2>/dev/null
 }
 trap cleanup EXIT
 
@@ -34,9 +30,9 @@ TMUX=
     tmux \
     new-session "source .env && berty mini -g \$GRP_KEY; read" \; select-pane -T no-docker \;                              `# run a simple instance` \
     split-window "source .env && docker run -it --rm bertytech/berty mini -g \$GRP_KEY; read" \; select-pane -T docker \;  `# run an instance within docker` \
-    split-window "docker-compose run aaron; read" \; select-pane -T compose-aaron \;                                       `# run instances within docker-compose` \
-    split-window "docker-compose run betty; read" \; select-pane -T compose-betty \; \
-    split-window "docker-compose run chris; read" \; select-pane -T compose-chris \; \
+    split-window "docker compose run aaron; read" \; select-pane -T compose-aaron \;                                       `# run instances within docker compose` \
+    split-window "docker compose run betty; read" \; select-pane -T compose-betty \; \
+    split-window "docker compose run chris; read" \; select-pane -T compose-chris \; \
     select-layout even-vertical \;                                                                                         `# tmux styling` \
     set pane-border-status top \; \
     set pane-border-format "#{pane_index} #{pane_current_command} #{pane_title}"
diff --git a/tool/deployments/rdvp-dev/Makefile b/tool/deployments/rdvp-dev/Makefile
@@ -2,16 +2,16 @@
 all: up ps logs
 
 up:
-	docker-compose up -d
+	docker compose up -d
 
 logs:
-	docker-compose logs --tail=100 -f
+	docker compose logs --tail=100 -f
 
 down ps:
-	docker-compose $@
+	docker compose $@
 
 genkey:
-	echo RDVP_PK=`docker-compose run server genkey` > .env
+	echo RDVP_PK=`docker compose run server genkey` > .env
 
 ip:
 	curl ifconfig.co
diff --git a/tool/deployments/testbot/Makefile b/tool/deployments/testbot/Makefile
@@ -2,18 +2,18 @@
 all: up ps logs
 
 up:
-	docker-compose up -d daemon1 daemon2
-	docker-compose stop bot || true
-	docker-compose up -d --force-recreate bot
+	docker compose up -d daemon1 daemon2
+	docker compose stop bot || true
+	docker compose up -d --force-recreate bot
 
 logs:
-	docker-compose logs --tail=100 -f
+	docker compose logs --tail=100 -f
 
 down:
-	docker-compose down --remove-orphans
+	docker compose down --remove-orphans
 
 ps pull:
-	docker-compose $@
+	docker compose $@
 
 restorecleandb: down
 	# this command trashes the runtime db and restores a clean db that only has the same private key
@@ -27,8 +27,8 @@ restorecleandb: down
 
 initdb:
 	# initialize a daemon and quit
-	docker-compose run daemon1 -xec "berty share-invite -store.dir=/store/run"
-	docker-compose run daemon2 -xec "berty share-invite -store.dir=/store/run"
+	docker compose run daemon1 -xec "berty share-invite -store.dir=/store/run"
+	docker compose run daemon2 -xec "berty share-invite -store.dir=/store/run"
 	# rename run dir to clean dir
 	mv data/daemon1/run data/daemon1/clean
 	mv data/daemon2/run data/daemon2/clean
diff --git a/tool/deployments/watchtower/Makefile b/tool/deployments/watchtower/Makefile
@@ -2,10 +2,10 @@
 all: up logs
 
 up:
-	docker-compose up -d
+	docker compose up -d
 
 logs:
-	docker-compose logs --tail=100 -f
+	docker compose logs --tail=100 -f
 
 down:
-	docker-compose down
+	docker compose down
diff --git a/tool/deployments/welcomebot/Makefile b/tool/deployments/welcomebot/Makefile
@@ -2,13 +2,13 @@
 all: up ps logs
 
 up:
-	docker-compose up -d
+	docker compose up -d
 
 logs:
-	docker-compose logs --tail=100 -f
+	docker compose logs --tail=100 -f
 
 ps pull down:
-	docker-compose $@
+	docker compose $@
 
 stats:
 	# Conversations
@@ -29,27 +29,27 @@ _backup-and-clean: down
 initdb:
 	@if [ -d data/daemon/clean ]; then echo "[-] init already done"; exit 1; fi
 	mkdir -p data/daemon/run
-	docker-compose run daemon share-invite -store.dir=/store/run
+	docker compose run daemon share-invite -store.dir=/store/run
 	make exportdb
 	cp -rf data/daemon/run data/daemon/clean
 	make print-qr
 
 exportdb:
-	docker-compose run daemon export \
+	docker compose run daemon export \
 	  -store.dir=/store/run \
 	  -export-path=/store/run/export.tar \
 	  -log.filters=info+*,-ipfs.*
 	ls -la data/daemon/run/export.tar
 
 importcleandb: _backup-and-clean
 	ls -la data/daemon
-	docker-compose run daemon share-invite \
+	docker compose run daemon share-invite \
 	  -store.dir=/store/run \
 	  -node.restore-export-path=/store/clean/export.tar \
 	  -log.filters=info+*,-ipfs.*
 
 print-qr:
-	docker-compose run daemon share-invite \
+	docker compose run daemon share-invite \
 	  -store.dir=/store/run \
 	  -log.filters=none \
 	  -name=Welcomebot
diff --git a/tool/integration-compose/Makefile b/tool/integration-compose/Makefile
@@ -1,5 +1,5 @@
 all:
-	docker-compose down --remove-orphans
-	docker-compose run integration || \
-		(docker-compose logs testbot_daemon1 && docker-compose logs testbot_daemon2)
-	docker-compose down --remove-orphans
+	docker compose down --remove-orphans
+	docker compose run integration || \
+		(docker compose logs testbot_daemon1 && docker compose logs testbot_daemon2)
+	docker compose down --remove-orphans