diff --git a/Makefile b/Makefile index e45438f19..4c6cb8a3b 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ setup_xdg_data_home: ## docker-compose: validate build args, setup xdg data home, and run docker-compose up docker-compose: validate_docker_build_args setup_xdg_data_home - docker-compose up + docker compose up ## dbg debug build allows see C stack traces, run it with GOTRACEBACK=crash. You don't need debug build for C pit for profiling. To profile C code use SETCGOTRCKEBACK=1 dbg: @@ -200,7 +200,7 @@ bindings: ## prometheus: run prometheus and grafana with docker-compose prometheus: - docker-compose up prometheus grafana + docker compose up prometheus grafana ## escape: run escape path={path} to check for memory leaks e.g. run escape path=cmd/erigon escape: diff --git a/README.md b/README.md index 567be5100..16e113e8c 100644 --- a/README.md +++ b/README.md @@ -499,7 +499,7 @@ Windows support for docker-compose is not ready yet. Please help us with .ps1 po ### Grafana dashboard -`docker-compose up prometheus grafana`, [detailed docs](./cmd/prometheus/Readme.md). +`docker compose up prometheus grafana`, [detailed docs](./cmd/prometheus/Readme.md). ### diff --git a/cmd/prometheus/Readme.md b/cmd/prometheus/Readme.md index 3b89fcd4c..853eb91b2 100644 --- a/cmd/prometheus/Readme.md +++ b/cmd/prometheus/Readme.md @@ -2,7 +2,7 @@ Add flag `--metrics` to Erigon or any other process (add `--metrics.addr` if nee Add hosts to collecting metrics in: `./cmd/prometheus/prometheus.yml` -Run Grafana and Prometheus: `docker-compose up -d prometheus grafana` or `make prometheus` +Run Grafana and Prometheus: `docker compose up -d prometheus grafana` or `make prometheus` Go to: [localhost:3000](localhost:3000), admin/admin diff --git a/tests/automated-testing/run.sh b/tests/automated-testing/run.sh index a21fb908a..78d608b06 100755 --- a/tests/automated-testing/run.sh +++ b/tests/automated-testing/run.sh @@ -3,8 +3,8 @@ function stopContainers () { # stop containers echo "stopping containers..." - docker-compose --profile=first down -v --remove-orphans - docker-compose --profile=second down -v --remove-orphans + docker compose --profile=first down -v --remove-orphans + docker compose --profile=second down -v --remove-orphans } ORIGINAL_DIR=$(pwd) @@ -46,7 +46,7 @@ docker compose pull # run node 1 echo "starting node 1..." -docker-compose --profile=first up -d --force-recreate --remove-orphans +docker compose --profile=first up -d --force-recreate --remove-orphans # wait for node 1 to start up echo "waiting for node 1 to start up..." @@ -55,7 +55,7 @@ sleep 10 # run node 2 echo "starting node 2..." export ENODE=$(./scripts/enode.sh) -docker-compose --profile=second up -d --force-recreate --remove-orphans +docker compose --profile=second up -d --force-recreate --remove-orphans # wait for node 2 to start up echo "waiting for node 2 to start up..."