From cc0e80e37df5c6ce9b1f8e1a039728a190c99c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nurzhan=20Sak=C3=A9n?= Date: Wed, 22 May 2024 12:37:33 +0400 Subject: [PATCH 1/3] Replace `docker-compose` (V1) with `docker compose` (V2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nurzhan Sakén --- src/guide/advanced/running-iroha-on-bare-metal.md | 2 +- src/guide/get-started/python.md | 2 +- src/guide/get-started/quick-start.md | 6 ++---- 3 files changed, 4 insertions(+), 6 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..6bfced89b 100644 --- a/src/guide/advanced/running-iroha-on-bare-metal.md +++ b/src/guide/advanced/running-iroha-on-bare-metal.md @@ -354,7 +354,7 @@ 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 +tutorial uses `docker compose`. 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 From 95d438bf9c6c66bb9e85b0614e6dd56c8144a4e7 Mon Sep 17 00:00:00 2001 From: Nurzhan Saken Date: Wed, 26 Jun 2024 16:44:32 +0400 Subject: [PATCH 2/3] Fix spelling in bare metal tutorial Co-authored-by: yamkovoy <100563712+yamkovoy@users.noreply.github.com> Signed-off-by: Nurzhan Saken --- src/guide/advanced/running-iroha-on-bare-metal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guide/advanced/running-iroha-on-bare-metal.md b/src/guide/advanced/running-iroha-on-bare-metal.md index 6bfced89b..04f7c765e 100644 --- a/src/guide/advanced/running-iroha-on-bare-metal.md +++ b/src/guide/advanced/running-iroha-on-bare-metal.md @@ -353,7 +353,7 @@ 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 +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. tutorial uses `docker compose`. However, this brings you closer to the experience of actually maintaining a functional Iroha peer. From 67b4f353c07645eeb7afd586e4fe52c2d4afec9f Mon Sep 17 00:00:00 2001 From: yamkovoy <100563712+yamkovoy@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:26:45 +0300 Subject: [PATCH 3/3] Update src/guide/advanced/running-iroha-on-bare-metal.md Signed-off-by: yamkovoy <100563712+yamkovoy@users.noreply.github.com> --- src/guide/advanced/running-iroha-on-bare-metal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guide/advanced/running-iroha-on-bare-metal.md b/src/guide/advanced/running-iroha-on-bare-metal.md index 04f7c765e..442d270e9 100644 --- a/src/guide/advanced/running-iroha-on-bare-metal.md +++ b/src/guide/advanced/running-iroha-on-bare-metal.md @@ -354,7 +354,7 @@ ports need to be adjusted so there are no collisions. See the ## Deploy a minimal BFT network 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. -tutorial uses `docker compose`. However, this brings you closer to the +However, this brings you closer to the experience of actually maintaining a functional Iroha peer. ### Using Environment Variables