Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Docker Compose v2 syntax #1035

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Update to Docker Compose v2 syntax #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test_runner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)



Expand Down
Loading