diff --git a/docker/README.md b/docker/README.md index 2f6ce69f..5f72d2ec 100644 --- a/docker/README.md +++ b/docker/README.md @@ -61,7 +61,7 @@ Start `btcd`, and then create an address for `Alice` that we'll directly mine bitcoin into. ```bash # Init bitcoin network env variable: -$ export BITCOIN_NETWORK="simnet" +$ export NETWORK="simnet" # Run "btcd" node: $ docker-compose up -d "btcd" @@ -286,7 +286,7 @@ First of all you need to run `btcd` node in `testnet` and wait it to be synced with test network (`May the Force and Patience be with you` ᕦ(ò_óˇ)ᕤ). ```bash # Init bitcoin network env variable: -$ export BITCOIN_NETWORK="testnet" +$ export NETWORK="testnet" # Run "btcd" node: $ docker-compose up -d "btcd" diff --git a/docker/btcd/start-btcctl.sh b/docker/btcd/start-btcctl.sh index 557272c9..419f73d5 100755 --- a/docker/btcd/start-btcctl.sh +++ b/docker/btcd/start-btcctl.sh @@ -41,10 +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") +NETWORK=$(set_default "$NETWORK" "simnet") btcctl \ - "--$BITCOIN_NETWORK" \ + "--$NETWORK" \ --rpccert="/rpc/rpc.cert" \ --rpcuser="$RPCUSER" \ --rpcpass="$RPCPASS" \ diff --git a/docker/btcd/start-btcd.sh b/docker/btcd/start-btcd.sh index f11b8575..515afdfe 100755 --- a/docker/btcd/start-btcd.sh +++ b/docker/btcd/start-btcd.sh @@ -42,10 +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") +NETWORK=$(set_default "$NETWORK" "simnet") PARAMS=$(echo \ - "--$BITCOIN_NETWORK" \ + "--$NETWORK" \ "--debuglevel=$DEBUG" \ "--rpcuser=$RPCUSER" \ "--rpcpass=$RPCPASS" \ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c3cc79f5..3eaf20b0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -14,7 +14,7 @@ services: environment: - RPCUSER - RPCPASS - - BITCOIN_NETWORK + - NETWORK btcd: extends: btc @@ -39,7 +39,7 @@ services: environment: - RPCUSER - RPCPASS - - BITCOIN_NETWORK + - NETWORK - DEBUG volumes: - shared:/rpc diff --git a/docker/lnd/start-lnd.sh b/docker/lnd/start-lnd.sh index 104019fa..7c636a78 100755 --- a/docker/lnd/start-lnd.sh +++ b/docker/lnd/start-lnd.sh @@ -42,13 +42,13 @@ set_default() { RPCUSER=$(set_default "$RPCUSER" "devuser") RPCPASS=$(set_default "$RPCPASS" "devpass") DEBUG=$(set_default "$DEBUG" "debug") -BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") +NETWORK=$(set_default "$NETWORK" "simnet") lnd \ --datadir="/data" \ --logdir="/data" \ --bitcoin.active \ - "--bitcoin.$BITCOIN_NETWORK" \ + "--bitcoin.$NETWORK" \ --bitcoin.rpchost="btcd" \ --bitcoin.rpccert="/rpc/rpc.cert" \ --bitcoin.rpcuser="$RPCUSER" \