Skip to content

Commit

Permalink
fix: e2e by updating docker-compose to docker compose (#1457)
Browse files Browse the repository at this point in the history
## Description

attempts to fix some of the e2e failures by updating docker compose
usage
  • Loading branch information
evan-forbes authored Aug 14, 2024
1 parent 6333e56 commit a6658ff
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,12 @@ build_c-amazonlinux:
# Run a 4-node testnet locally
localnet-start: localnet-stop build-docker-localnode
@if ! [ -f build/node0/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/cometbft:Z cometbft/localnode testnet --config /etc/cometbft/config-template.toml --o . --starting-ip-address 192.167.10.2; fi
docker-compose up
docker compose up
.PHONY: localnet-start

# Stop testnet
localnet-stop:
docker-compose down
docker compose down
.PHONY: localnet-stop

# Build hooks for dredd, to skip or add information on some steps
Expand Down
4 changes: 2 additions & 2 deletions spec/ivy-proofs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The license above applies to all files in this folder.
The easiest way to check the proofs is to use [Docker](https://www.docker.com/).

1. Install [Docker](https://docs.docker.com/get-docker/) and [Docker Compose](https://docs.docker.com/compose/install/).
2. Build a Docker image: `docker-compose build`
3. Run the proofs inside the Docker container: `docker-compose run
2. Build a Docker image: `docker compose build`
3. Run the proofs inside the Docker container: `docker compose run
tendermint-proof`. This will check all the proofs with the `ivy_check`
command and write the output of `ivy_check` to a subdirectory of `./output/'
6 changes: 3 additions & 3 deletions test/e2e/runner/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@ func execVerbose(args ...string) error {
// execCompose runs a Docker Compose command for a testnet.
func execCompose(dir string, args ...string) error {
return exec(append(
[]string{"docker-compose", "-f", filepath.Join(dir, "docker-compose.yml")},
[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml")},
args...)...)
}

func execComposeOutput(dir string, args ...string) ([]byte, error) {
return execOutput(append(
[]string{"docker-compose", "-f", filepath.Join(dir, "docker-compose.yml")},
[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml")},
args...)...)
}

// execComposeVerbose runs a Docker Compose command for a testnet and displays its output.
func execComposeVerbose(dir string, args ...string) error {
return execVerbose(append(
[]string{"docker-compose", "-f", filepath.Join(dir, "docker-compose.yml")},
[]string{"docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml")},
args...)...)
}

Expand Down

0 comments on commit a6658ff

Please sign in to comment.