[OTE-664] Change docker-compose to new syntax (#2035)

(cherry picked from commit 6930857)
dydxprotocol · Aug 7, 2024 · 9b5e662 · 9b5e662
1 parent 3d2ea07
commit 9b5e662
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -105,6 +105,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: start localnet
         run: |
           DOCKER_BUILDKIT=1 make localnet-startd

diff --git a/protocol/Makefile b/protocol/Makefile
@@ -365,12 +365,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}"
@@ -383,10 +383,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 \