try

Signed-off-by: xhe <[email protected]>
pingcap · Aug 15, 2024 · d88091b · d88091b
1 parent ef09896
commit d88091b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/.github/workflows/integrate-cluster-cmd.yaml b/.github/workflows/integrate-cluster-cmd.yaml
@@ -61,9 +61,6 @@ jobs:
           export PATH=$PATH:$GOPATH/bin
           make build_integration_test
 
-      - uses: KengoTODA/actions-setup-docker-compose@v1
-        with:
-          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

diff --git a/.github/workflows/integrate-cluster-scale.yaml b/.github/workflows/integrate-cluster-scale.yaml
@@ -61,9 +61,6 @@ jobs:
           export PATH=$PATH:$GOPATH/bin
           make build_integration_test
 
-      - uses: KengoTODA/actions-setup-docker-compose@v1
-        with:
-          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

diff --git a/.github/workflows/integrate-dm.yaml b/.github/workflows/integrate-dm.yaml
@@ -62,9 +62,6 @@ jobs:
           make build_integration_test
           make tiup
 
-      - uses: KengoTODA/actions-setup-docker-compose@v1
-        with:
-          version: '2.14.2'
       - name: Build the docker-compose stack
         working-directory: ${{ env.working-directory }}
         # with --dev the first run will fail for unknow reason, just retry it and will success now..

diff --git a/docker/up.sh b/docker/up.sh
@@ -182,9 +182,6 @@ exists python ||
 exists docker ||
     { ERROR "Please install docker (https://docs.docker.com/engine/installation/)";
       exit 1; }
-exists docker-compose ||
-    { ERROR "Please install docker-compose (https://docs.docker.com/compose/install/)";
-      exit 1; }
 
 exists pip ||
     {
@@ -233,17 +230,17 @@ echo "TIUP_TEST_IP_PREFIX=$ipprefix" >> ./secret/control.env
 
 INFO "Running \`docker-compose build\`"
 # shellcheck disable=SC2086
-docker-compose -f docker-compose.yml ${COMPOSE} ${DEV} build
+docker compose -f docker-compose.yml ${COMPOSE} ${DEV} build
 
 INFO "Running \`docker-compose up\`"
 if [ "${RUN_AS_DAEMON}" -eq 1 ]; then
     # shellcheck disable=SC2086
-    docker-compose -f docker-compose.yml ${COMPOSE} ${DEV} up -d
+    docker compose -f docker-compose.yml ${COMPOSE} ${DEV} up -d
     INFO "All containers started, run \`docker ps\` to view"
 else
     INFO "Please run \`docker exec -it tiup-cluster-control bash\` in another terminal to proceed"
     # shellcheck disable=SC2086
-    docker-compose -f docker-compose.yml ${COMPOSE} ${DEV} up
+    docker compose -f docker-compose.yml ${COMPOSE} ${DEV} up
 fi
 
 popd