Skip to content

Commit

Permalink
Quick fix on broken --timeout in Docker Compose v2.17 (docker/compose…
Browse files Browse the repository at this point in the history
  • Loading branch information
jimsihk committed Apr 7, 2023
1 parent d21870c commit d1b4a13
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Build and Test
run: |
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ env.TEST_TAG }}
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
- name: Run Trivy vulnerability scanner
uses: aquasecurity/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Build and Test
run: |
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
- name: Build and push
uses: docker/build-push-action@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Build and Test
run: |
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ github.sha }}
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
- name: Run Trivy vulnerability scanner for PR
uses: aquasecurity/[email protected]
Expand Down

0 comments on commit d1b4a13

Please sign in to comment.