Skip to content

Commit

Permalink
[OTE-664] Change docker-compose to new syntax (#2035)
Browse files Browse the repository at this point in the history
  • Loading branch information
jerryfan01234 authored Aug 6, 2024
1 parent 5cc0a28 commit 6930857
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/protocol-benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/protocol-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions protocol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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 \
Expand Down

0 comments on commit 6930857

Please sign in to comment.