docker: change BITCOIN_NETWORK -> NETWORK

This parameter now might not belong to the Bitcoin network, because we
introduce the Litecoin image soon.
This commit is contained in:
Andrey Samokhvalov 2017-05-13 23:21:14 +03:00 committed by Olaoluwa Osuntokun
parent 1cd576e93a
commit 24ae098d18
5 changed files with 10 additions and 10 deletions

View File

@ -61,7 +61,7 @@ Start `btcd`, and then create an address for `Alice` that we'll directly mine
bitcoin into. bitcoin into.
```bash ```bash
# Init bitcoin network env variable: # Init bitcoin network env variable:
$ export BITCOIN_NETWORK="simnet" $ export NETWORK="simnet"
# Run "btcd" node: # Run "btcd" node:
$ docker-compose up -d "btcd" $ 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` ᕦ(ò_óˇ)ᕤ). synced with test network (`May the Force and Patience be with you` ᕦ(ò_óˇ)ᕤ).
```bash ```bash
# Init bitcoin network env variable: # Init bitcoin network env variable:
$ export BITCOIN_NETWORK="testnet" $ export NETWORK="testnet"
# Run "btcd" node: # Run "btcd" node:
$ docker-compose up -d "btcd" $ docker-compose up -d "btcd"

View File

@ -41,10 +41,10 @@ set_default() {
# Set default variables if needed. # Set default variables if needed.
RPCUSER=$(set_default "$RPCUSER" "devuser") RPCUSER=$(set_default "$RPCUSER" "devuser")
RPCPASS=$(set_default "$RPCPASS" "devpass") RPCPASS=$(set_default "$RPCPASS" "devpass")
BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") NETWORK=$(set_default "$NETWORK" "simnet")
btcctl \ btcctl \
"--$BITCOIN_NETWORK" \ "--$NETWORK" \
--rpccert="/rpc/rpc.cert" \ --rpccert="/rpc/rpc.cert" \
--rpcuser="$RPCUSER" \ --rpcuser="$RPCUSER" \
--rpcpass="$RPCPASS" \ --rpcpass="$RPCPASS" \

View File

@ -42,10 +42,10 @@ set_default() {
RPCUSER=$(set_default "$RPCUSER" "devuser") RPCUSER=$(set_default "$RPCUSER" "devuser")
RPCPASS=$(set_default "$RPCPASS" "devpass") RPCPASS=$(set_default "$RPCPASS" "devpass")
DEBUG=$(set_default "$DEBUG" "info") DEBUG=$(set_default "$DEBUG" "info")
BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") NETWORK=$(set_default "$NETWORK" "simnet")
PARAMS=$(echo \ PARAMS=$(echo \
"--$BITCOIN_NETWORK" \ "--$NETWORK" \
"--debuglevel=$DEBUG" \ "--debuglevel=$DEBUG" \
"--rpcuser=$RPCUSER" \ "--rpcuser=$RPCUSER" \
"--rpcpass=$RPCPASS" \ "--rpcpass=$RPCPASS" \

View File

@ -14,7 +14,7 @@ services:
environment: environment:
- RPCUSER - RPCUSER
- RPCPASS - RPCPASS
- BITCOIN_NETWORK - NETWORK
btcd: btcd:
extends: btc extends: btc
@ -39,7 +39,7 @@ services:
environment: environment:
- RPCUSER - RPCUSER
- RPCPASS - RPCPASS
- BITCOIN_NETWORK - NETWORK
- DEBUG - DEBUG
volumes: volumes:
- shared:/rpc - shared:/rpc

View File

@ -42,13 +42,13 @@ set_default() {
RPCUSER=$(set_default "$RPCUSER" "devuser") RPCUSER=$(set_default "$RPCUSER" "devuser")
RPCPASS=$(set_default "$RPCPASS" "devpass") RPCPASS=$(set_default "$RPCPASS" "devpass")
DEBUG=$(set_default "$DEBUG" "debug") DEBUG=$(set_default "$DEBUG" "debug")
BITCOIN_NETWORK=$(set_default "$BITCOIN_NETWORK" "simnet") NETWORK=$(set_default "$NETWORK" "simnet")
lnd \ lnd \
--datadir="/data" \ --datadir="/data" \
--logdir="/data" \ --logdir="/data" \
--bitcoin.active \ --bitcoin.active \
"--bitcoin.$BITCOIN_NETWORK" \ "--bitcoin.$NETWORK" \
--bitcoin.rpchost="btcd" \ --bitcoin.rpchost="btcd" \
--bitcoin.rpccert="/rpc/rpc.cert" \ --bitcoin.rpccert="/rpc/rpc.cert" \
--bitcoin.rpcuser="$RPCUSER" \ --bitcoin.rpcuser="$RPCUSER" \