From 6dc380ecd34d5d78a63ed692a97e9685bce7dd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nurzhan=20Sak=C3=A9n?= Date: Thu, 26 Sep 2024 12:47:24 +0400 Subject: [PATCH] feat(swarm): use bash to launch irohad MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nurzhan Sakén --- crates/iroha_swarm/src/lib.rs | 10 +++++----- crates/iroha_swarm/src/schema.rs | 2 +- defaults/docker-compose.local.yml | 2 +- defaults/docker-compose.single.yml | 2 +- defaults/docker-compose.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/iroha_swarm/src/lib.rs b/crates/iroha_swarm/src/lib.rs index a7b00c9da75..6074eb67e87 100644 --- a/crates/iroha_swarm/src/lib.rs +++ b/crates/iroha_swarm/src/lib.rs @@ -200,7 +200,7 @@ mod tests { - ./client.toml:/config/client.toml:ro init: true command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ @@ -253,7 +253,7 @@ mod tests { - ./client.toml:/config/client.toml:ro init: true command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ @@ -306,7 +306,7 @@ mod tests { - ./client.toml:/config/client.toml:ro init: true command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ @@ -420,7 +420,7 @@ mod tests { retries: 30 start_period: 4s command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ @@ -476,7 +476,7 @@ mod tests { retries: 30 start_period: 4s command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ diff --git a/crates/iroha_swarm/src/schema.rs b/crates/iroha_swarm/src/schema.rs index 09a0752d54b..787f5701b0d 100644 --- a/crates/iroha_swarm/src/schema.rs +++ b/crates/iroha_swarm/src/schema.rs @@ -327,7 +327,7 @@ where #[derive(Debug)] struct SignAndSubmitGenesis; -const SIGN_AND_SUBMIT_GENESIS: &str = r#"/bin/sh -c " +const SIGN_AND_SUBMIT_GENESIS: &str = r#"/bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ diff --git a/defaults/docker-compose.local.yml b/defaults/docker-compose.local.yml index 93fcafb97ac..b75e03448c8 100644 --- a/defaults/docker-compose.local.yml +++ b/defaults/docker-compose.local.yml @@ -32,7 +32,7 @@ services: retries: 30 start_period: 4s command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ diff --git a/defaults/docker-compose.single.yml b/defaults/docker-compose.single.yml index 40e6fc7b5d1..a38642f9f23 100644 --- a/defaults/docker-compose.single.yml +++ b/defaults/docker-compose.single.yml @@ -31,7 +31,7 @@ services: retries: 30 start_period: 4s command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\ diff --git a/defaults/docker-compose.yml b/defaults/docker-compose.yml index c9edf40efa8..960f34fb990 100644 --- a/defaults/docker-compose.yml +++ b/defaults/docker-compose.yml @@ -30,7 +30,7 @@ services: retries: 30 start_period: 4s command: |- - /bin/sh -c " + /bin/bash -c " EXECUTOR_RELATIVE_PATH=$(jq -r '.executor' /config/genesis.json) && \\ EXECUTOR_ABSOLUTE_PATH=$(realpath \"/config/$$EXECUTOR_RELATIVE_PATH\") && \\ jq \\