Skip to content

Commit

Permalink
migrate to v2 docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
zansinergise committed Aug 13, 2024
1 parent 6cbb3a9 commit e967e6d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/reusable_lint_and_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:
- uses: actions/checkout@v4

- name: Docker-compose build
run: docker-compose -f docker-compose.yml -f docker-compose.pytest.yml build
run: docker compose -f docker-compose.yml -f docker-compose.pytest.yml build

- name: Docker-compose up and run pytest
run: docker-compose -f docker-compose.yml -f docker-compose.pytest.yml up --exit-code-from pytest
run: docker compose -f docker-compose.yml -f docker-compose.pytest.yml up --exit-code-from pytest

- name: Docker-compose cleanup
if: always()
run: docker-compose -f docker-compose.yml -f docker-compose.pytest.yml down -v
run: docker compose -f docker-compose.yml -f docker-compose.pytest.yml down -v
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Mandatory:

First, start up all services:
```
$ docker-compose up -d
$ docker compose up -d
```

Download definitions of defined processes:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.pytest.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: "2.4"
# This file helps run services so we can run integration tests.
# For testing: docker-compose up --abort-on-container-exit --exit-code-from pytest
# For testing: docker compose up --abort-on-container-exit --exit-code-from pytest
# To see exit code: echo Exit Code is %errorlevel%
# For usage: docker-compose up -d
# For usage: docker compose up -d

services:

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: "2.4"
# This file helps run services so we can run integration tests.
# For testing: docker-compose up --abort-on-container-exit --exit-code-from pytest
# For testing: docker compose up --abort-on-container-exit --exit-code-from pytest
# To see exit code: echo Exit Code is %errorlevel%
# For usage: docker-compose up -d
# For usage: docker compose up -d

services:

Expand Down
4 changes: 2 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Requirements:

Procedure for running tests:
```
$ docker-compose build
$ docker-compose up -d
$ docker compose build
$ docker compose up -d
$ cd rest/
$ pipenv install --dev
$ pipenv shell
Expand Down

0 comments on commit e967e6d

Please sign in to comment.