diff --git a/scripts/simapp/generate_template.sh b/scripts/simapp/generate_template.sh index dff9811e..26dee504 100755 --- a/scripts/simapp/generate_template.sh +++ b/scripts/simapp/generate_template.sh @@ -9,8 +9,8 @@ source "$SCRIPT_DIR"/env rm -rf "$SCRIPT_DIR/template" mkdir "$SCRIPT_DIR/template" -cp setup.sh "$SCRIPT_DIR/template/" -cp run_simd.sh "$SCRIPT_DIR/template/" +cp setup.sh "$SCRIPT_DIR/template/" && chmod +x "$SCRIPT_DIR/template/setup.sh" +cp run_simd.sh "$SCRIPT_DIR/template/" && chmod +x "$SCRIPT_DIR/template/run_simd.sh" # The usage of the accounts below is documented in README.md of this directory docker run --rm \ diff --git a/scripts/simapp/run_simd.sh b/scripts/simapp/run_simd.sh old mode 100755 new mode 100644 index 7a66bbbb..3264dacc --- a/scripts/simapp/run_simd.sh +++ b/scripts/simapp/run_simd.sh @@ -2,6 +2,6 @@ set -o errexit -o nounset -o pipefail command -v shellcheck > /dev/null && shellcheck "$0" +cp -R "/template/.simapp" /root mkdir -p /root/log - simd start --rpc.laddr tcp://0.0.0.0:26657 --trace diff --git a/scripts/simapp/setup.sh b/scripts/simapp/setup.sh old mode 100755 new mode 100644 diff --git a/scripts/simapp/start.sh b/scripts/simapp/start.sh index 7d66da2c..ad11f87e 100755 --- a/scripts/simapp/start.sh +++ b/scripts/simapp/start.sh @@ -15,12 +15,16 @@ echo "Using temporary dir $TMP_DIR" SIMD_LOGFILE="$TMP_DIR/simd.log" PORT=26657 +# Use a fresh volume for every start +docker volume rm -f simapp_data + docker run --rm \ --name "$CONTAINER_NAME" \ -p "$PORT:$PORT" \ - --mount type=bind,source="$SCRIPT_DIR/template",target=/root \ + --mount type=bind,source="$SCRIPT_DIR/template",target=/template \ + --mount type=volume,source=simapp_data,target=/root \ "$REPOSITORY:$VERSION" \ - ./run_simd.sh \ + /template/run_simd.sh \ > "$SIMD_LOGFILE" & echo "simd running on http://localhost:$PORT and logging into $SIMD_LOGFILE" diff --git a/scripts/simapp/template/run_simd.sh b/scripts/simapp/template/run_simd.sh index 7a66bbbb..3264dacc 100755 --- a/scripts/simapp/template/run_simd.sh +++ b/scripts/simapp/template/run_simd.sh @@ -2,6 +2,6 @@ set -o errexit -o nounset -o pipefail command -v shellcheck > /dev/null && shellcheck "$0" +cp -R "/template/.simapp" /root mkdir -p /root/log - simd start --rpc.laddr tcp://0.0.0.0:26657 --trace diff --git a/scripts/wasmd/start.sh b/scripts/wasmd/start.sh index 06223a77..fdd04568 100755 --- a/scripts/wasmd/start.sh +++ b/scripts/wasmd/start.sh @@ -17,9 +17,11 @@ echo "Using temporary dir $TMP_DIR" WASMD_LOGFILE="$TMP_DIR/wasmd.log" REST_SERVER_LOGFILE="$TMP_DIR/rest-server.log" +# Use a fresh volume for every start +docker volume rm -f wasmd_data + # This starts up wasmd # The Tendermint port (26657) and the p2p port (26656) are not exposed since we don't need for testing -docker volume rm -f wasmd_data docker run --rm \ --name "$CONTAINER_NAME" \ -p "$REST_PORT_HOST":"$REST_PORT_GUEST" \