From f3d47bdcc14e455765928facd111f5530009289f Mon Sep 17 00:00:00 2001 From: njeans Date: Sat, 28 Jan 2023 14:46:23 -0600 Subject: [PATCH] fix dockerfile --- deployment/dockerfiles/Dockerfile | 16 +++++++++++++++- hacking/scripts/node_init.sh | 14 +++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/deployment/dockerfiles/Dockerfile b/deployment/dockerfiles/Dockerfile index 44e0d751b..f2f8e4abf 100644 --- a/deployment/dockerfiles/Dockerfile +++ b/deployment/dockerfiles/Dockerfile @@ -319,4 +319,18 @@ COPY deployment/docker/localsecret/faucet/faucet_server.js . HEALTHCHECK --interval=5s --timeout=1s --retries=120 CMD bash -c 'curl -sfm1 http://localhost:26657/status && curl -s http://localhost:26657/status | jq -e "(.result.sync_info.latest_block_height | tonumber) > 0"' -ENTRYPOINT ["./bootstrap_init.sh"] \ No newline at end of file +COPY hacking/scripts/startup.sh /root/scripts/startup.sh +RUN chmod +x /root/scripts/startup.sh + +COPY hacking/scripts/bootstrap_init.sh /root/scripts/bootstrap_init.sh +RUN chmod +x /root/scripts/bootstrap_init.sh + +COPY hacking/scripts/node_init.sh /root/scripts/node_init.sh +RUN chmod +x /root/scripts/node_init.sh + +COPY hacking/scripts/rebuild.sh /root/scripts/rebuild.sh +RUN chmod +x /root/scripts/rebuild.sh + +ENTRYPOINT ["/bin/bash", "/root/scripts/startup.sh"] + +#ENTRYPOINT ["./bootstrap_init.sh"] diff --git a/hacking/scripts/node_init.sh b/hacking/scripts/node_init.sh index 6c932ed11..0207f3ccb 100755 --- a/hacking/scripts/node_init.sh +++ b/hacking/scripts/node_init.sh @@ -109,13 +109,13 @@ then # sleep 10 && chmod -R ugo+rwx ~/.secretd/* & else echo "Restarting node~~~~~~~~~~~~~" - curr_dir=$(pwd) - cd /go/src/github.com/enigmampc/SecretNetwork/ +# curr_dir=$(pwd) +# cd /go/src/github.com/enigmampc/SecretNetwork/ # make build_cli - make build_local_no_rust - cp secretd /usr/bin/secretd - chmod +x secretd - cd $curr_dir +# make build_local_no_rust +# cp secretd /usr/bin/secretd +# chmod +x secretd +# cd $curr_dir # PERSISTENT_PEERS="115aa0a629f5d70dd1d464bc7e42799e00f4edae@localsecret-1:26656" # sed -i 's/persistent_peers = "'$PERSISTENT_PEERS'"/persistent_peers = ""/g' ~/.secretd/config/config.toml sed -i 's/pex = true/pex = false/g' ~/.secretd/config/config.toml @@ -125,4 +125,4 @@ else fi # sed -i 's/pex = true/pex = false/g' ~/.secretd/config/config.toml # echo "Set pex = false" -# RUST_BACKTRACE=1 secretd start --rpc.laddr tcp://0.0.0.0:26657 \ No newline at end of file +# RUST_BACKTRACE=1 secretd start --rpc.laddr tcp://0.0.0.0:26657