Fix docker compose command in GH CI

macropin · macropin · commit 78212091a650 · 2025-10-14T11:21:05.000+11:00
diff --git a/tests/setup.bash b/tests/setup.bash
@@ -1,11 +1,11 @@
 setup() {
-	docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" up --detach
-	cmak_dc_port=$(docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" port cmak 9000)
+	docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" up --detach
+	cmak_dc_port=$(docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" port cmak 9000)
 	cmak_port="${cmak_dc_port##*:}" # strip the 0.0.0.0: from the variable
 	( wait_http "http://127.0.0.1:${cmak_port}/api/health"; )
 }
 
 teardown() {
 	# teardown runs after each test
-	docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" rm --force --stop -v || true
+	docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" rm --force --stop -v || true
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`setup() {`
`2`		`- docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" up --detach`
`3`		`- cmak_dc_port=$(docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" port cmak 9000)`
	`2`	`+ docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" up --detach`
	`3`	`+ cmak_dc_port=$(docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" port cmak 9000)`
`4`	`4`	`cmak_port="${cmak_dc_port##*:}" # strip the 0.0.0.0: from the variable`
`5`	`5`	`( wait_http "http://127.0.0.1:${cmak_port}/api/health"; )`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`teardown() {`
`9`	`9`	`# teardown runs after each test`
`10`		`- docker-compose -p "tests-${BATS_SUITE_TEST_NUMBER}" rm --force --stop -v \|\| true`
	`10`	`+ docker compose -p "tests-${BATS_SUITE_TEST_NUMBER}" rm --force --stop -v \|\| true`
`11`	`11`	`}`