Skip to content

Commit 5fca86b

Browse files
committed
Use docker compose
1 parent 1f90482 commit 5fca86b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install Python dependencies
2828
run: pip install -r dev-requirements.txt
2929
- name: Fetch containers
30-
run: docker-compose build && docker-compose pull
30+
run: docker compose build && docker compose pull
3131
- name: Run test
3232
run: ./scripts/test.sh
3333

scripts/test.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ set -e
55
export PATH=env/bin:${PATH}
66

77
echo "> Start all containers..."
8-
docker-compose up -d
8+
docker compose up -d
99

1010
echo "> Await postgres..."
11-
until docker-compose exec -T psql pg_isready -U postgres
11+
until docker compose exec -T psql pg_isready -U postgres
1212
do
1313
sleep 1
1414
done
1515

1616
echo "> Await mysql..."
17-
until docker-compose exec -T mysql bash -c 'mysqladmin ping --protocol tcp -p$MYSQL_ROOT_PASSWORD'
17+
until docker compose exec -T mysql bash -c 'mysqladmin ping --protocol tcp -p$MYSQL_ROOT_PASSWORD'
1818
do
1919
sleep 3
2020
done
2121

2222
pytest -v
2323

2424
echo "> Clean up..."
25-
docker-compose down -t 3
25+
docker compose down -t 3

0 commit comments

Comments
 (0)