Skip to content

Commit

Permalink
Update docker-compose to new format
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Apr 3, 2024
1 parent 1cd63f9 commit ec3a40f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
File renamed without changes.
10 changes: 5 additions & 5 deletions tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit ec3a40f

Please sign in to comment.