From 15c2341a72ca27bafc3d92401f0457e060904b32 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:39:27 -0400
Subject: [PATCH] [OTE-664] Change docker-compose to new syntax (backport
 #2035) (#2057)

Co-authored-by: jerryfan01234 <44346807+jerryfan01234@users.noreply.github.com>
Co-authored-by: roy-dydx <133032749+roy-dydx@users.noreply.github.com>
---
 .github/workflows/protocol-benchmark.yml | 3 +++
 .github/workflows/protocol-test.yml      | 5 ++++-
 protocol/Makefile                        | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/protocol-benchmark.yml b/.github/workflows/protocol-benchmark.yml
index abcc12e4a8..61e4098e4c 100644
--- a/.github/workflows/protocol-benchmark.yml
+++ b/.github/workflows/protocol-benchmark.yml
@@ -28,6 +28,9 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: 1.22
+      - name: Prune Docker system to free up space
+        run: |
+          docker system prune -a --volumes -f
       - name: Run Benchmarks
         run: make benchmark | tee ./benchmark_output.txt
       - name: Download previous benchmark data
diff --git a/.github/workflows/protocol-test.yml b/.github/workflows/protocol-test.yml
index 3bc5d6ab3f..7acdff5998 100644
--- a/.github/workflows/protocol-test.yml
+++ b/.github/workflows/protocol-test.yml
@@ -104,7 +104,10 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.21
+          go-version: 1.22
+      - name: Prune Docker system to free up space
+        run: |
+          docker system prune -a --volumes -f
       - name: start localnet
         run: |
           DOCKER_BUILDKIT=1 make localnet-startd
diff --git a/protocol/Makefile b/protocol/Makefile
index 2475b5d590..fd8901678a 100644
--- a/protocol/Makefile
+++ b/protocol/Makefile
@@ -367,12 +367,12 @@ localnet-init:
 localnet-compose-up:
 	@echo "Launching localnet at commit ${GIT_COMMIT_HASH}"
 	@docker build . -t local:dydxprotocol -f testing/testnet-local/Dockerfile --no-cache
-	@docker-compose -f docker-compose.yml up --force-recreate $(ARGS)
+	@docker compose -f docker-compose.yml up --force-recreate $(ARGS)
 
 localnet-compose-upd:
 	@echo "Launching localnet at commit ${GIT_COMMIT_HASH}"
 	@docker build . -t local:dydxprotocol -f testing/testnet-local/Dockerfile --no-cache
-	@docker-compose -f docker-compose.yml up --force-recreate -d $(ARGS)
+	@docker compose -f docker-compose.yml up --force-recreate -d $(ARGS)
 
 build-e2etest-image:
 	@echo "Build e2e test image at commit ${GIT_COMMIT_HASH}"
@@ -385,10 +385,10 @@ e2etest-build-image: localnet-init build-e2etest-image
 
 # Continue the localnet with the same chain state.
 localnet-continue:
-	@docker-compose -f docker-compose.yml up $(ARGS)
+	@docker compose -f docker-compose.yml up $(ARGS)
 
 localnet-stop:
-	@docker-compose -f docker-compose.yml down
+	@docker compose -f docker-compose.yml down
 
 .PHONY: all build-linux install format lint \
 	go-mod-cache draw-deps clean build build-contract-tests-hooks \