diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 205ef05..979dd81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Install Python dependencies run: pip install -r dev-requirements.txt - name: Fetch containers - run: docker-compose build && docker-compose pull + run: docker compose build && docker compose pull - name: Run test run: ./scripts/test.sh diff --git a/scripts/test.sh b/scripts/test.sh index 673f2e7..476ac98 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -5,16 +5,16 @@ set -e export PATH=env/bin:${PATH} echo "> Start all containers..." -docker-compose up -d +docker compose up -d echo "> Await postgres..." -until docker-compose exec -T psql pg_isready -U postgres +until docker compose exec -T psql pg_isready -U postgres do sleep 1 done echo "> Await mysql..." -until docker-compose exec -T mysql bash -c 'mysqladmin ping --protocol tcp -p$MYSQL_ROOT_PASSWORD' +until docker compose exec -T mysql bash -c 'mysqladmin ping --protocol tcp -p$MYSQL_ROOT_PASSWORD' do sleep 3 done @@ -22,4 +22,4 @@ done pytest -v echo "> Clean up..." -docker-compose down -t 3 +docker compose down -t 3