From d1989df0ebfa465099c67e9d1bb42e9307d35245 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Wed, 22 Jan 2020 15:29:24 +0100 Subject: [PATCH] Separated out run_all from run_wasmd to execute as two processes --- README.md | 6 +++--- docker/logs.sh | 0 docker/run.sh | 17 ----------------- docker/run_all.sh | 8 ++++++++ docker/run_wasmd.sh | 10 ++++++++++ 5 files changed, 21 insertions(+), 20 deletions(-) mode change 100644 => 100755 docker/logs.sh delete mode 100644 docker/run.sh create mode 100755 docker/run_all.sh create mode 100755 docker/run_wasmd.sh diff --git a/README.md b/README.md index 2b75ed78..7b15abd8 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ docker run --rm -it \ # This will start both wasmd and wasmcli rest-server, only wasmcli output is shown on the screen docker run --rm -it -p 26657:26657 -p 26656:26656 -p 1317:1317 \ --mount type=volume,source=wasmd_data,target=/root \ - wasmd:manual ./run.sh + wasmd:manual ./run_all.sh # view wasmd logs in another shell docker run --rm -it \ @@ -80,12 +80,12 @@ docker volume rm -f wasmd_data docker run --rm -it -p 26657:26657 -p 26656:26656 -p 1317:1317 \ --mount type=bind,source=$(pwd)/template,target=/template \ --mount type=volume,source=wasmd_data,target=/root \ - wasmd:manual ./run.sh /template + wasmd:manual ./run_all.sh /template # RESTART CHAIN with existing state docker run --rm -it -p 26657:26657 -p 26656:26656 -p 1317:1317 \ --mount type=volume,source=wasmd_data,target=/root \ - wasmd:manual ./run.sh + wasmd:manual ./run_all.sh # view wasmd logs in another shell docker run --rm -it \ diff --git a/docker/logs.sh b/docker/logs.sh old mode 100644 new mode 100755 diff --git a/docker/run.sh b/docker/run.sh deleted file mode 100644 index 3e3b6680..00000000 --- a/docker/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if test -n "$1"; then - # need -R not -r to copy hidden files - cp -R "$1/.wasmd" /root - cp -R "$1/.wasmcli" /root -fi - -echo Starting Wasmd... - -mkdir -p /root/log -wasmd start --rpc.laddr tcp://0.0.0.0:26657 >> /root/log/wasmd.log & - -sleep 4 -echo Starting Rest Server... - -wasmcli rest-server --laddr tcp://0.0.0.0:1317 --trust-node diff --git a/docker/run_all.sh b/docker/run_all.sh new file mode 100755 index 00000000..1dc95a48 --- /dev/null +++ b/docker/run_all.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +./run_wasmd.sh >> /root/log/wasmd.log & + +sleep 4 +echo Starting Rest Server... + +wasmcli rest-server --laddr tcp://0.0.0.0:1317 --trust-node diff --git a/docker/run_wasmd.sh b/docker/run_wasmd.sh new file mode 100755 index 00000000..a1a140ca --- /dev/null +++ b/docker/run_wasmd.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if test -n "$1"; then + # need -R not -r to copy hidden files + cp -R "$1/.wasmd" /root + cp -R "$1/.wasmcli" /root +fi + +mkdir -p /root/log +wasmd start --rpc.laddr tcp://0.0.0.0:26657