Skip to content

Commit 463c63e

Browse files
committed
Quick fix on broken --timeout in Docker Compose v2.17 (docker/compose#10269)
1 parent 3fd4e24 commit 463c63e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: .github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build and Test
6060
run: |
6161
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ env.TEST_TAG }}
62-
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
62+
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
6363
6464
- name: Run Trivy vulnerability scanner
6565
uses: aquasecurity/[email protected]

Diff for: .github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Build and Test
3434
run: |
3535
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
36-
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
36+
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
3737
3838
- name: Build and push
3939
uses: docker/build-push-action@v4

Diff for: .github/workflows/test-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Build and Test
1919
run: |
2020
export TEST_IMAGE_NAME=${{ env.IMAGE_NAME }}:${{ github.sha }}
21-
docker compose --file docker-compose.test.yml up --exit-code-from sut --timeout 10 --build
21+
docker compose --file docker-compose.test.yml up --exit-code-from sut -t 10 --build
2222
2323
- name: Run Trivy vulnerability scanner for PR
2424
uses: aquasecurity/[email protected]

0 commit comments

Comments
 (0)