From 0948bc35795ac8ce246eb51b81e668152255956d Mon Sep 17 00:00:00 2001 From: Andrey Samokhvalov Date: Fri, 13 Jan 2017 23:25:51 +0300 Subject: [PATCH] docker: add BITCOIN_NETWORK param --- docker/btcd/start-btcctl.sh | 3 ++- docker/btcd/start-btcd.sh | 3 ++- docker/docker-compose.yml | 2 ++ docker/lnd/start-lnd.sh | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docker/btcd/start-btcctl.sh b/docker/btcd/start-btcctl.sh index 8be20025..557272c9 100755 --- a/docker/btcd/start-btcctl.sh +++ b/docker/btcd/start-btcctl.sh @@ -41,9 +41,10 @@ set_default() { # Set default variables if needed. RPCUSER=$(set_default "$RPCUSER" "devuser") RPCPASS=$(set_default "$RPCPASS" "devpass") +BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") btcctl \ - --simnet \ + "--$BITCOIN_NETWORK" \ --rpccert="/rpc/rpc.cert" \ --rpcuser="$RPCUSER" \ --rpcpass="$RPCPASS" \ diff --git a/docker/btcd/start-btcd.sh b/docker/btcd/start-btcd.sh index 7dbaa262..f11b8575 100755 --- a/docker/btcd/start-btcd.sh +++ b/docker/btcd/start-btcd.sh @@ -42,9 +42,10 @@ set_default() { RPCUSER=$(set_default "$RPCUSER" "devuser") RPCPASS=$(set_default "$RPCPASS" "devpass") DEBUG=$(set_default "$DEBUG" "info") +BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") PARAMS=$(echo \ - "--simnet" \ + "--$BITCOIN_NETWORK" \ "--debuglevel=$DEBUG" \ "--rpcuser=$RPCUSER" \ "--rpcpass=$RPCPASS" \ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 60d7147b..c3cc79f5 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,6 +14,7 @@ services: environment: - RPCUSER - RPCPASS + - BITCOIN_NETWORK btcd: extends: btc @@ -38,6 +39,7 @@ services: environment: - RPCUSER - RPCPASS + - BITCOIN_NETWORK - DEBUG volumes: - shared:/rpc diff --git a/docker/lnd/start-lnd.sh b/docker/lnd/start-lnd.sh index 2f8393c4..ef7cad51 100755 --- a/docker/lnd/start-lnd.sh +++ b/docker/lnd/start-lnd.sh @@ -42,11 +42,12 @@ set_default() { RPCUSER=$(set_default "$RPCUSER" "devuser") RPCPASS=$(set_default "$RPCPASS" "devpass") DEBUG=$(set_default "$DEBUG" "debug") +BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") lnd \ --datadir="/data" \ --logdir="/data" \ - --simnet \ + "--$BITCOIN_NETWORK" \ --btcdhost="btcd" \ --rpccert="/rpc/rpc.cert" \ --rpcuser="$RPCUSER" \