From cbc2f73a0c4268caee7fbf142ce8e997833c49d6 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Tue, 6 Aug 2024 15:46:27 +0300 Subject: [PATCH] *: migrate to Docker Compose V2 Docker Compose V1 is deprecated since June 2023, ref. https://docs.docker.com/compose/migrate/ and https://github.com/nspcc-dev/neo-bench/issues/166. Signed-off-by: Anna Shaleva --- .docker/docker-compose.yml | 2 -- Makefile | 8 ++++---- docs/consensus.md | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index b7eabc902..f12304bc4 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2.4' - networks: default: name: neo_go_network diff --git a/Makefile b/Makefile index e8b0c9c02..81bbe18ad 100644 --- a/Makefile +++ b/Makefile @@ -131,19 +131,19 @@ env_image: env_up: @echo "=> Bootup environment" @echo " Docker-compose file: $(DC_FILE)" - @docker-compose -f $(DC_FILE) up -d node_one node_two node_three node_four + @docker compose -f $(DC_FILE) up -d node_one node_two node_three node_four env_single: @echo "=> Bootup environment" - @docker-compose -f $(DC_FILE) up -d node_single + @docker compose -f $(DC_FILE) up -d node_single env_down: @echo "=> Stop environment" - @docker-compose -f $(DC_FILE) down + @docker compose -f $(DC_FILE) down env_restart: @echo "=> Stop and start environment" - @docker-compose -f $(DC_FILE) restart + @docker compose -f $(DC_FILE) restart env_clean: env_down @echo "=> Cleanup environment" diff --git a/docs/consensus.md b/docs/consensus.md index 2a3e300be..e1705994b 100644 --- a/docs/consensus.md +++ b/docs/consensus.md @@ -155,7 +155,7 @@ four-node setup. #### Prerequisites - `docker` of version >= 20.10.0 -- `docker-compose` +- `docker compose` V2 - `go` compiler #### Instructions @@ -166,7 +166,7 @@ make env_up # start containers, use "make env_single" for single CN ``` To monitor logs: ```bash -docker-compose -f .docker/docker-compose.yml logs -f +docker compose -f .docker/docker-compose.yml logs -f ``` To stop: