From c1520e4cb06216428e21b4b7305e29247bdf0737 Mon Sep 17 00:00:00 2001 From: Nurzhan Saken Date: Wed, 26 Jun 2024 17:30:37 +0400 Subject: [PATCH] Replace `docker-compose` (V1) with `docker compose` (V2) (#490) * Replace `docker-compose` (V1) with `docker compose` (V2) * Fix spelling in bare metal tutorial * Update src/guide/advanced/running-iroha-on-bare-metal.md --------- Signed-off-by: Nurzhan Saken Signed-off-by: yamkovoy <100563712+yamkovoy@users.noreply.github.com> Co-authored-by: yamkovoy <100563712+yamkovoy@users.noreply.github.com> --- src/guide/advanced/running-iroha-on-bare-metal.md | 4 ++-- src/guide/get-started/python.md | 2 +- src/guide/get-started/quick-start.md | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/guide/advanced/running-iroha-on-bare-metal.md b/src/guide/advanced/running-iroha-on-bare-metal.md index c6816a418..442d270e9 100644 --- a/src/guide/advanced/running-iroha-on-bare-metal.md +++ b/src/guide/advanced/running-iroha-on-bare-metal.md @@ -353,8 +353,8 @@ ports need to be adjusted so there are no collisions. See the ## Deploy a minimal BFT network -Both of there approaches are messy and error-prone, which is why the -tutorial uses `docker-compose`. However, this brings you closer to the +Both of the following approaches could be messy and error-prone, which is why the [Quick Start](../get-started/quick-start.md) tutorial suggests using the `docker compose` command. +However, this brings you closer to the experience of actually maintaining a functional Iroha peer. ### Using Environment Variables diff --git a/src/guide/get-started/python.md b/src/guide/get-started/python.md index 56852a87f..39efdb6e4 100644 --- a/src/guide/get-started/python.md +++ b/src/guide/get-started/python.md @@ -53,7 +53,7 @@ $ cp -vfr ~/Git/iroha/configs/client/config.json example/config.json ::: tip You can also use the provided `config.json` in the `example` folder if you -also call `docker-compose up` from that same folder. This has to do with +also call `docker compose up` from that same folder. This has to do with the fact that the configuration for the Docker files in Iroha Python is slightly different. diff --git a/src/guide/get-started/quick-start.md b/src/guide/get-started/quick-start.md index a0900b1a9..5173b35c3 100644 --- a/src/guide/get-started/quick-start.md +++ b/src/guide/get-started/quick-start.md @@ -7,12 +7,10 @@ 2. [Install Iroha from GitHub](./install.md). -3. Run `docker-compose` to bring up a network of 4 containerised peers: - - +3. Run `docker compose` to bring up a network of 4 containerised peers: ```bash - $ docker-compose up + $ docker compose up ``` Depending on your set-up, this might either