Skip to content

Commit

Permalink
Merge pull request steemit#2824 from steemit/2820-external-testnet-sc…
Browse files Browse the repository at this point in the history
…ripts

Pull testnet init scripts from external source
  • Loading branch information
Michael Vandeberg authored Aug 22, 2018
2 parents 5ac7ff1 + 1d284ce commit 3c4b978
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 197 deletions.
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ ADD contrib/fullnode.config.ini /etc/steemd/fullnode.config.ini
ADD contrib/fullnode.opswhitelist.config.ini /etc/steemd/fullnode.opswhitelist.config.ini
ADD contrib/config-for-broadcaster.ini /etc/steemd/config-for-broadcaster.ini
ADD contrib/config-for-ahnode.ini /etc/steemd/config-for-ahnode.ini
ADD contrib/testnet.config.ini /etc/steemd/testnet.config.ini
ADD contrib/fastgen.config.ini /etc/steemd/fastgen.config.ini

# add normal startup script that starts via sv
ADD contrib/steemd.run /usr/local/bin/steem-sv-run.sh
Expand All @@ -262,12 +260,12 @@ ADD contrib/healthcheck.conf.template /etc/nginx/healthcheck.conf.template

# add PaaS startup script and service script
ADD contrib/startpaassteemd.sh /usr/local/bin/startpaassteemd.sh
ADD contrib/testnetinit.sh /usr/local/bin/testnetinit.sh
ADD contrib/pulltestnetscripts.sh /usr/local/bin/pulltestnetscripts.sh
ADD contrib/paas-sv-run.sh /usr/local/bin/paas-sv-run.sh
ADD contrib/sync-sv-run.sh /usr/local/bin/sync-sv-run.sh
ADD contrib/healthcheck.sh /usr/local/bin/healthcheck.sh
RUN chmod +x /usr/local/bin/startpaassteemd.sh
RUN chmod +x /usr/local/bin/testnetinit.sh
RUN chmod +x /usr/local/bin/pulltestnetscripts.sh
RUN chmod +x /usr/local/bin/paas-sv-run.sh
RUN chmod +x /usr/local/bin/sync-sv-run.sh
RUN chmod +x /usr/local/bin/healthcheck.sh
Expand Down
41 changes: 0 additions & 41 deletions contrib/fastgen.config.ini

This file was deleted.

12 changes: 12 additions & 0 deletions contrib/pulltestnetscripts.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

echo steemd-testnet: getting deployment scripts from external source

wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/testnetinit.sh > /usr/local/bin/testnetinit.sh
wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/testnet.config.ini > /etc/steemd/testnet.config.ini
wget -qO- $SCRIPTURL/master/$LAUNCHENV/$APP/fastgen.config.ini > /etc/steemd/fastgen.config.ini
chmod +x /usr/local/bin/testnetinit.sh

echo steemd-testnet: launching testnetinit script

/usr/local/bin/testnetinit.sh
2 changes: 1 addition & 1 deletion contrib/steemdentrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [[ ! "$USE_PAAS" ]]; then
chmod +x /etc/service/steemd/run
runsv /etc/service/steemd
elif [[ "$IS_TESTNET" ]]; then
/usr/local/bin/testnetinit.sh
/usr/local/bin/pulltestnetscripts.sh
else
/usr/local/bin/startpaassteemd.sh
fi
44 changes: 0 additions & 44 deletions contrib/testnet.config.ini

This file was deleted.

107 changes: 0 additions & 107 deletions contrib/testnetinit.sh

This file was deleted.

0 comments on commit 3c4b978

Please sign in to comment.