diff --git a/.github/workflows/test_runner.yaml b/.github/workflows/test_runner.yaml index 74aa429b..faaddd56 100644 --- a/.github/workflows/test_runner.yaml +++ b/.github/workflows/test_runner.yaml @@ -42,7 +42,7 @@ jobs: touch requirements.*.txt make devenv - name: Start SQL Server and Trino instances for the tests - run: docker-compose up -d mssql trino + run: docker compose up -d mssql trino - name: Run tests run: | source ${{ github.workspace }}/venv/bin/activate @@ -56,9 +56,9 @@ jobs: - name: Build docker run: make docker-build ENV=dev - name: Basic docker test - run: docker-compose run --rm -v $PWD:/workspace dev cohortextractor + run: docker compose run --rm -v $PWD:/workspace dev cohortextractor - name: Run unit tests in docker - run: docker-compose run --rm -v $PWD:/workspace dev pytest + run: docker compose run --rm -v $PWD:/workspace dev pytest build: name: Test we can build PyPI package diff --git a/Makefile b/Makefile index 1a7b3cdd..9a1925ac 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ docker-build: export VERSION=$(shell git describe --tags) docker-build: export DOCKER_BUILDKIT=1 docker-build: ENV=dev docker-build: - docker-compose build --pull $(ARGS) $(ENV) + docker compose build --pull $(ARGS) $(ENV)