From e2c169e440ecc5e5c6506a5ca5dc72466c272424 Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Tue, 26 Jul 2022 20:23:11 +0300 Subject: [PATCH] [#196] Remove `-i` key in `docker exec` in `bin/resolve.sh` Signed-off-by: anastasia prasolova --- bin/resolve.sh | 2 +- bin/tick.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/resolve.sh b/bin/resolve.sh index 009aa54..36a1ac2 100755 --- a/bin/resolve.sh +++ b/bin/resolve.sh @@ -5,7 +5,7 @@ source bin/helper.sh # NeoGo binary path. -NEOGO="${NEOGO:-docker exec -it morph_chain neo-go}" +NEOGO="${NEOGO:-docker exec -t morph_chain neo-go}" # NNS contract script hash output=$(curl -s --data '{ "id": 1, "jsonrpc": "2.0", "method": "getcontractstate", "params": [1] }' \ "http://morph-chain.${LOCAL_DOMAIN}:30333/") \ diff --git a/bin/tick.sh b/bin/tick.sh index 1ef6352..ede13c2 100755 --- a/bin/tick.sh +++ b/bin/tick.sh @@ -7,6 +7,7 @@ source bin/helper.sh # NeoGo binary path. NEOGO="${NEOGO:-docker exec -it main_chain neo-go}" +NEOGO_NONINTERACTIVE="${NEOGO_NONINTERACTIVE:-docker exec -t main_chain neo-go}" # Wallet files to change config value WALLET="${WALLET:-services/chain/node-wallet.json}" @@ -29,7 +30,7 @@ BLOCK_DURATION=$(grep SecondsPerBlock < "$SIDECHAIN_PROTO" | awk '{print $2}') \ NETMAP_ADDR=$(bin/resolve.sh netmap.neofs) || die "Cannot resolve netmap.neofs" # Fetch current epoch value -EPOCH=$(${NEOGO} contract testinvokefunction \ +EPOCH=$(${NEOGO_NONINTERACTIVE} contract testinvokefunction \ -r "http://morph-chain.${LOCAL_DOMAIN}:30333" "${NETMAP_ADDR}" epoch \ | grep 'value' | awk -F'"' '{ print $4 }') \ || die "Cannot fetch epoch from netmap contract"