From b0aaebd166c322aa5731703e24b2159a24f8499f Mon Sep 17 00:00:00 2001
From: Vadim Yavorsky <yavrsky@gmail.com>
Date: Mon, 6 Jan 2025 04:02:33 +0000
Subject: [PATCH] Fix docker

---
 .github/workflows/comprehensive.yml        | 18 ++++++++++++------
 .github/workflows/container-test.yml       |  8 ++++----
 .github/workflows/network-browser-test.yml |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/comprehensive.yml b/.github/workflows/comprehensive.yml
index 81f135a8..94928304 100644
--- a/.github/workflows/comprehensive.yml
+++ b/.github/workflows/comprehensive.yml
@@ -105,8 +105,14 @@ jobs:
         sudo apt-get install -y procps
         sudo apt-get install -y curl
 
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+    - name: Set up Docker
+      uses: docker/setup-docker@v2
+
+    - name: Install Docker Compose
+      run: |
+        sudo curl -L "https://github.com/docker/compose/releases/download/v2.32.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+        sudo chmod +x /usr/local/bin/docker-compose
+        docker-compose --version
 
     - name: INIT - reconfigure docker and restart its daemon
       run: |
@@ -293,7 +299,7 @@ jobs:
         cd sgxwallet/run_sgx_sim
         rm -rf ../../local_sgxwallet_output_log.txt &> /dev/null
         echo " --------------------------- stopping sgx wallet ------------------------------------------------------------------------------------------------------ "
-        docker compose down
+        docker-compose down
         echo " --------------------------- fixing sgx wallets docker config ----------------------------------------------------------------------------------------- "
         mv docker-compose.yml docker-compose.yml.old-previous || true
         echo "version: '3'"                                 > docker-compose.yml
@@ -318,7 +324,7 @@ jobs:
         echo '        max-file: "4"'                       >> docker-compose.yml
         echo '    command: -s -y -V -d'                    >> docker-compose.yml
         echo " --------------------------- pulling sgx wallet ------------------------------------------------------------------------------------------------------- "
-        docker compose pull
+        docker-compose pull
         cd ../..
         cd ..
 
@@ -327,7 +333,7 @@ jobs:
       run: |
         cd comprehensive-test
         cd sgxwallet/run_sgx_sim
-        docker compose up &> ../../local_sgxwallet_output_log.txt &
+        docker-compose up &> ../../local_sgxwallet_output_log.txt &
         sleep 90
         cd ../..
         cd ..
@@ -404,7 +410,7 @@ jobs:
       run: |
         cd comprehensive-test
         cd sgxwallet/run_sgx_sim
-        docker compose down
+        docker-compose down
         cd ../..
         cd ..
 
diff --git a/.github/workflows/container-test.yml b/.github/workflows/container-test.yml
index 6d103c32..f81c6b5e 100644
--- a/.github/workflows/container-test.yml
+++ b/.github/workflows/container-test.yml
@@ -327,7 +327,7 @@ jobs:
         cd sgxwallet/run_sgx_sim
         rm -rf ../../local_sgxwallet_output_log.txt &> /dev/null
         echo " --------------------------- stopping sgx wallet ------------------------------------------------------------------------------------------------------ "
-        docker compose down
+        docker-compose down
         echo " --------------------------- fixing sgx wallets docker config ----------------------------------------------------------------------------------------- "
         mv docker-compose.yml docker-compose.yml.old-previous || true
         echo "version: '3'"                                 > docker-compose.yml
@@ -353,7 +353,7 @@ jobs:
         echo '        max-file: "4"'                       >> docker-compose.yml
         echo '    command: -s -y -V -d'                    >> docker-compose.yml
         echo " --------------------------- pulling sgx wallet ------------------------------------------------------------------------------------------------------- "
-        docker compose pull
+        docker-compose pull
         cd ../..
         cd ..
 
@@ -362,7 +362,7 @@ jobs:
       run: |
         cd comprehensive-test
         cd sgxwallet/run_sgx_sim
-        docker compose up &> ../../local_sgxwallet_output_log.txt &
+        docker-compose up &> ../../local_sgxwallet_output_log.txt &
         sleep 90
         cd ../..
         cd ..
@@ -457,7 +457,7 @@ jobs:
       run: |
         cd comprehensive-test
         cd sgxwallet/run_sgx_sim
-        docker compose down
+        docker-compose down
         cd ../..
         cd ..
 
diff --git a/.github/workflows/network-browser-test.yml b/.github/workflows/network-browser-test.yml
index d0da5ad6..1476e366 100644
--- a/.github/workflows/network-browser-test.yml
+++ b/.github/workflows/network-browser-test.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: oven-sh/setup-bun@v1
       - name: Launch hardhat node
         working-directory: hardhat-node
-        run: docker compose up -d
+        run: docker-compose up -d
       - name: Deploy manager contracts
         run: |
           bash ./helper-scripts/deploy_test_manager.sh