feat(swarm): use bash to launch irohad

Signed-off-by: Nurzhan Sakén <[email protected]>
hyperledger · Sep 26, 2024 · 6dc380e · 6dc380e
1 parent 4574ec8
commit 6dc380e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 \\