From a6658ff64f28d517bd3e4816ccdc80f07a52d022 Mon Sep 17 00:00:00 2001 From: Evan Forbes <42654277+evan-forbes@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:41:17 -0500 Subject: [PATCH] fix: e2e by updating docker-compose to docker compose (#1457) ## Description attempts to fix some of the e2e failures by updating docker compose usage --- Makefile | 4 ++-- spec/ivy-proofs/README.md | 4 ++-- test/e2e/runner/exec.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8f155e16c1..125a67ac7e 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/spec/ivy-proofs/README.md b/spec/ivy-proofs/README.md index 00a4bed259..9b0f16e73e 100644 --- a/spec/ivy-proofs/README.md +++ b/spec/ivy-proofs/README.md @@ -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/' diff --git a/test/e2e/runner/exec.go b/test/e2e/runner/exec.go index 6cccbf6076..2a511182ee 100644 --- a/test/e2e/runner/exec.go +++ b/test/e2e/runner/exec.go @@ -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...)...) }