diff --git a/config.ini b/config.ini index 6d624eaf..bfc2e969 100644 --- a/config.ini +++ b/config.ini @@ -9,7 +9,7 @@ macaroon_path=~/.lnd/data/chain/bitcoin/testnet/admin.macaroon [bitcoin] rpc_host=localhost -rpc_port=18332 +rpc_port=18334 rpc_user=devuser rpc_pass=devpass zeromq_hashblock_port=28334 diff --git a/docker/docker-compose.btcd.yml b/docker/docker-compose.btcd.yml index 7dd9ccb8..16ac9471 100644 --- a/docker/docker-compose.btcd.yml +++ b/docker/docker-compose.btcd.yml @@ -8,13 +8,13 @@ services: context: ../ dockerfile: docker/btcd/Dockerfile volumes: - - shared_data:/rpc + - ~/.btcd-shared-data:/rpc - ~/.btcd:/data environment: - NETWORK=testnet - MINING_ADDRESS ports: - - 18556:18556 + - 18334:18334 entrypoint: ["./start-btcd.sh"] lnd_client: @@ -26,9 +26,13 @@ services: environment: - NETWORK=testnet - RPCHOST=btcd + depends_on: + - "btcd" volumes: - - shared_data:/rpc - - lnd_client_dir:/root/.lnd + - ~/.btcd-shared-data:/rpc + - ~/.lnd:/root/.lnd:rw + ports: + - 10009:10009 links: - "btcd:btcd" sysctls: @@ -44,8 +48,10 @@ services: environment: - NETWORK=testnet - RPCHOST=btcd + depends_on: + - "btcd" volumes: - - shared_data:/rpc + - ~/.btcd-shared-data:/rpc - lnd_server_dir:/root/.lnd links: - "btcd:blockchain" @@ -62,11 +68,12 @@ services: depends_on: - "lnd_server" volumes: - - shared_data:/rpc + - ~/.btcd-shared-data:/rpc - lnd_server_dir:/root/.lnd - ./config.ini:/config.ini ports: - 12995:12994 + - 18557:18555 links: - "btcd:btcd" - "lnd_server:lnd" @@ -74,29 +81,29 @@ services: - net.ipv6.conf.all.disable_ipv6=0 entrypoint: ["./start-squeaknode.sh"] - squeaknode_other: - image: squeaknode - container_name: squeaknode_other - build: - context: ../ - dockerfile: Dockerfile - volumes: - - shared_data:/rpc - - lnd_client_dir:/root/.lnd - - ./config.ini:/config.ini - ports: - - 12996:12994 - links: - - "btcd:btcd" - - "lnd_client:lnd" - sysctls: - - net.ipv6.conf.all.disable_ipv6=0 - entrypoint: ["./start-squeaknode.sh"] + # squeaknode_other: + # image: squeaknode + # container_name: squeaknode_other + # build: + # context: ../ + # dockerfile: Dockerfile + # volumes: + # - ~/.btcd-shared-data:/rpc + # - lnd_client_dir:/root/.lnd + # - ./config.ini:/config.ini + # ports: + # - 12996:12994 + # links: + # - "btcd:btcd" + # - "lnd_client:lnd" + # sysctls: + # - net.ipv6.conf.all.disable_ipv6=0 + # entrypoint: ["./start-squeaknode.sh"] volumes: - # btcctl and lnd containers. - shared_data: - driver: local + # # btcctl and lnd containers. + # shared_data: + # driver: local # # bitcoin_data volume is needed for maintaining blockchain persistence # # during btcd container recreation. @@ -104,7 +111,7 @@ volumes: # driver: local # lnd_dir volume is needed for sharing tht tls certificate - lnd_client_dir: - driver: local + # lnd_client_dir: + # driver: local lnd_server_dir: driver: local