diff --git a/.github/workflows/reusable_lint_and_test.yaml b/.github/workflows/reusable_lint_and_test.yaml index 77c3f213..405ae45a 100644 --- a/.github/workflows/reusable_lint_and_test.yaml +++ b/.github/workflows/reusable_lint_and_test.yaml @@ -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 \ No newline at end of file + run: docker compose -f docker-compose.yml -f docker-compose.pytest.yml down -v \ No newline at end of file diff --git a/README.md b/README.md index 94deaa6a..51ce177f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Mandatory: First, start up all services: ``` -$ docker-compose up -d +$ docker compose up -d ``` Download definitions of defined processes: diff --git a/docker-compose.pytest.yml b/docker-compose.pytest.yml index b20fd2c3..8625eed9 100644 --- a/docker-compose.pytest.yml +++ b/docker-compose.pytest.yml @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index 41556521..609ac586 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/tests/README.md b/tests/README.md index e8159162..c2d586dd 100644 --- a/tests/README.md +++ b/tests/README.md @@ -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