From d1b4a13d9a7075b283656b15b7aef601d7d1e97b Mon Sep 17 00:00:00 2001 From: jimsihk <99048231+jimsihk@users.noreply.github.com> Date: Fri, 7 Apr 2023 23:47:05 +0800 Subject: [PATCH] Quick fix on broken --timeout in Docker Compose v2.17 (https://github.com/docker/compose/issues/10269) --- .github/workflows/build.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/test-pr.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c34b59..37ed9d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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/trivy-action@0.9.2 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1ebb8e6..b394aec 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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 diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 9af34b2..564db97 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -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/trivy-action@0.9.2