From 48da75929ab2996652455b00be270284deb1a0d1 Mon Sep 17 00:00:00 2001
From: Simon Templer <simon@wetransform.to>
Date: Mon, 13 Jan 2025 15:44:38 +0100
Subject: [PATCH] ci: use `docker compose` instead of `docker-compose`

---
 test/integration/docker/tests/mysql    | 20 ++++++++++----------
 test/integration/docker/tests/postgres | 22 +++++++++++-----------
 test/integration/docker/tests/raw      | 16 ++++++++--------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/test/integration/docker/tests/mysql b/test/integration/docker/tests/mysql
index 779c0a44..7064f764 100755
--- a/test/integration/docker/tests/mysql
+++ b/test/integration/docker/tests/mysql
@@ -8,29 +8,29 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
 
 echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env
 
-docker-compose up -d mysql minio
+docker compose up -d mysql minio
 
 sleep 30
 
-docker-compose exec -T mysql mysql -prootpassword bivac < mysql_seed.sql
+docker compose exec -T mysql mysql -prootpassword bivac < mysql_seed.sql
 
-docker-compose up -d bivac
+docker compose up -d bivac
 
-docker-compose exec -T bivac bivac backup docker_mysql_data
+docker compose exec -T bivac bivac backup docker_mysql_data
 
-docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_mysql_data/ dump latest /var/lib/docker/volumes/docker_mysql_data/_data/backups/all.sql > /data/mysql_dump.sql"
+docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_mysql_data/ dump latest /var/lib/docker/volumes/docker_mysql_data/_data/backups/all.sql > /data/mysql_dump.sql"
 
-docker-compose down -v
+docker compose down -v
 
-docker-compose up -d mysql
+docker compose up -d mysql
 
 sleep 30
 
-docker-compose exec -T mysql mysql -prootpassword bivac < mysql_dump.sql
+docker compose exec -T mysql mysql -prootpassword bivac < mysql_dump.sql
 
-docker-compose exec -T mysql mysql -prootpassword bivac -e "select * from authors"
+docker compose exec -T mysql mysql -prootpassword bivac -e "select * from authors"
 
 rm -f mysql_dump.sql
 rm -f .env
 
-docker-compose down -v
+docker compose down -v
diff --git a/test/integration/docker/tests/postgres b/test/integration/docker/tests/postgres
index b36d0df8..83ad3736 100755
--- a/test/integration/docker/tests/postgres
+++ b/test/integration/docker/tests/postgres
@@ -8,31 +8,31 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
 
 echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env
 
-docker-compose up -d postgres minio
+docker compose up -d postgres minio
 
 sleep 30
 
-docker-compose exec -T postgres psql -U postgres bivac < postgres_seed.sql
+docker compose exec -T postgres psql -U postgres bivac < postgres_seed.sql
 
-docker-compose up -d bivac
+docker compose up -d bivac
 
-docker-compose exec -T bivac bivac backup docker_postgres_data
+docker compose exec -T bivac bivac backup docker_postgres_data
 
-docker-compose run restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > postgres_dump.sql
+docker compose run restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > postgres_dump.sql
 
-docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > /data/postgres_dump.sql"
+docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_postgres_data/ dump latest /var/lib/docker/volumes/docker_postgres_data/_data/backups/all.sql > /data/postgres_dump.sql"
 
-docker-compose down -v
+docker compose down -v
 
-docker-compose up -d postgres
+docker compose up -d postgres
 
 sleep 30
 
-docker-compose exec -T postgres psql -U postgres bivac < postgres_dump.sql
+docker compose exec -T postgres psql -U postgres bivac < postgres_dump.sql
 
-docker-compose exec -T postgres psql -U postgres bivac -c "select * from users"
+docker compose exec -T postgres psql -U postgres bivac -c "select * from users"
 
 rm -f postgres_dump.sql
 rm -f .env
 
-docker-compose down -v
+docker compose down -v
diff --git a/test/integration/docker/tests/raw b/test/integration/docker/tests/raw
index d7032aa8..0372dacd 100755
--- a/test/integration/docker/tests/raw
+++ b/test/integration/docker/tests/raw
@@ -8,17 +8,17 @@ INTERNAL_IP=$(ip -4 addr show docker0 | grep -Po 'inet \K[\d.]+')
 
 echo "BIVAC_TARGET_URL=s3:http://${INTERNAL_IP}:9000/testing" > .env
 
-docker-compose up -d raw minio
+docker compose up -d raw minio
 
-docker-compose exec -T raw bash -c "echo 'foo' > /data/foo"
-docker-compose exec -T raw bash -c "mkdir -p /data/subdir && echo 'bar' > /data/subdir/bar"
+docker compose exec -T raw bash -c "echo 'foo' > /data/foo"
+docker compose exec -T raw bash -c "mkdir -p /data/subdir && echo 'bar' > /data/subdir/bar"
 
-docker-compose up -d bivac
+docker compose up -d bivac
 
-docker-compose exec -T bivac bivac backup docker_raw_data
+docker compose exec -T bivac bivac backup docker_raw_data
 
-TEST_1=$(docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/foo")
-TEST_2=$(docker-compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/subdir/bar")
+TEST_1=$(docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/foo")
+TEST_2=$(docker compose exec -T bivac bash -c "restic -q -r s3:http://${INTERNAL_IP}:9000/testing/${HOSTNAME}/docker_raw_data/ dump latest /var/lib/docker/volumes/docker_raw_data/_data/subdir/bar")
 
 if [ "${TEST_1}" != "foo" ]; then
   echo "${TEST_1} != \"foo\"."
@@ -29,6 +29,6 @@ if [ "${TEST_2}" != "bar" ]; then
   exit 1
 fi
 
-docker-compose down -v
+docker compose down -v
 
 rm -f .env