Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Aug 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5fe790
[OTE-664] Change docker-compose to new syntax (#2035)
jerryfan01234 Aug 6, 2024
4d312b0
Fix merge conflict
roy-dydx Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/protocol-benchmark.yml
View file
Open in desktop
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
5 changes: 4 additions & 1 deletion .github/workflows/protocol-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions protocol/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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 \
Expand Down
Loading