Merge branch 'master' into 4.x

wodby · Apr 3, 2024 · 77902dc · 77902dc
2 parents d9165a2 + ec3a40f
commit 77902dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/docker-compose.yml → tests/compose.yml b/tests/docker-compose.yml → tests/compose.yml
diff --git a/tests/run.sh b/tests/run.sh
@@ -7,10 +7,10 @@ if [[ -n "${DEBUG}" ]]; then
 fi
 
 check_ready() {
-    docker-compose exec -T "${1}" make check-ready "${@:2}" -f /usr/local/bin/actions.mk
+    docker compose exec -T "${1}" make check-ready "${@:2}" -f /usr/local/bin/actions.mk
 }
 
-docker-compose up -d
+docker compose up -d
 
 check_ready nginx max_try=10
 check_ready php max_try=10
@@ -20,8 +20,8 @@ check_ready mariadb max_try=12 wait_seconds=5
 # Docker sets ephemeral shared volume ownership to default user (wodby) in nginx container (started after php)
 # In case of -dev-macos version of php images wodby owner uid/gid in php and nginx containers do not match
 if [[ "${IMAGE}" =~ "-dev-macos" ]]; then
-    docker-compose exec -T php sudo init_container
+    docker compose exec -T php sudo init_container
 fi
 
-docker-compose exec -T php tests.sh
-docker-compose down
+docker compose exec -T php tests.sh
+docker compose down