From 463c63e929aa133a5177f80a317e7f9b64a72e0e Mon Sep 17 00:00:00 2001
From: jimsihk <99048231+jimsihk@users.noreply.github.com>
Date: Fri, 7 Apr 2023 23:39:37 +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 03408ad40..3a90f9f4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,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 a6b7995cc..5eacd80b6 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 980d8abb5..f75136bd3 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