Update docker-compose to new format

wodby · Apr 3, 2024 · 7932430 · 7932430
1 parent 194d53c
commit 7932430
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/tests/10/docker-compose.yml → tests/10/compose.yml b/tests/10/docker-compose.yml → tests/10/compose.yml
diff --git a/tests/10/run.sh b/tests/10/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,9 +20,9 @@ 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 --user=0 php apk add --update jq grep
-docker-compose exec -T php tests.sh
-docker-compose down -v
+docker compose exec -T --user=0 php apk add --update jq grep
+docker compose exec -T php tests.sh
+docker compose down -v
diff --git a/tests/7/docker-compose.yml → tests/7/compose.yml b/tests/7/docker-compose.yml → tests/7/compose.yml
diff --git a/tests/7/run.sh b/tests/7/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,9 +20,9 @@ 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 --user=0 php apk add --update jq
-docker-compose exec -T php tests.sh
-docker-compose down -v
+docker compose exec -T --user=0 php apk add --update jq
+docker compose exec -T php tests.sh
+docker compose down -v