From 693085777215aa1fdb03f1d8b079ee4882c14264 Mon Sep 17 00:00:00 2001 From: jerryfan01234 <44346807+jerryfan01234@users.noreply.github.com> Date: Tue, 6 Aug 2024 10:56:32 -0400 Subject: [PATCH] [OTE-664] Change docker-compose to new syntax (#2035) --- .github/workflows/protocol-benchmark.yml | 3 +++ .github/workflows/protocol-test.yml | 3 +++ protocol/Makefile | 8 ++++---- 3 files changed, 10 insertions(+), 4 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 4ea5c76a15..c934d9bae5 100644 --- 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 index 064d101c7d..695e665c13 100644 --- 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 \