From af56b44aee04ce3b0c5dcff4515b8d10a5948a37 Mon Sep 17 00:00:00 2001 From: ChekaZ Date: Sun, 23 Sep 2018 14:01:17 +0200 Subject: [PATCH 1/5] update Feathercoin --- docker-compose-generator/docker-fragments/feathercoin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose-generator/docker-fragments/feathercoin.yml b/docker-compose-generator/docker-fragments/feathercoin.yml index 313cdb4..5d97802 100644 --- a/docker-compose-generator/docker-fragments/feathercoin.yml +++ b/docker-compose-generator/docker-fragments/feathercoin.yml @@ -4,7 +4,7 @@ services: feathercoind: restart: unless-stopped container_name: btcpayserver_feathercoind - image: chekaz/docker-feathercoin:0.16.0 + image: chekaz/docker-feathercoin:0.16.3 environment: BITCOIN_EXTRA_ARGS: | rpcport=43782 From 4ccb55af27d4c968bc5d821caa822ecc93cb81ba Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 28 Sep 2018 17:32:52 +0900 Subject: [PATCH 2/5] bump --- .../docker-compose.btc-clightning.yml | 8 ++++++-- .../docker-compose.btc-ltc-clightning.yml | 14 +++++++++++--- .../docker-compose.btc-ltc.yml | 10 +++++++++- Production-NoReverseProxy/docker-compose.btc.yml | 6 +++++- .../docker-compose.ltc-clightning.yml | 8 ++++++-- Production-NoReverseProxy/docker-compose.ltc.yml | 6 +++++- Production/docker-compose.btc-clightning.yml | 8 ++++++-- Production/docker-compose.btc-ltc-clightning.yml | 14 +++++++++++--- Production/docker-compose.btc-ltc.yml | 10 +++++++++- Production/docker-compose.btc.yml | 6 +++++- Production/docker-compose.ltc-clightning.yml | 8 ++++++-- Production/docker-compose.ltc.yml | 6 +++++- .../docker-fragments/bitcoin-clightning.yml | 2 +- .../docker-fragments/bitcoin-lnd.yml | 8 +++++--- .../docker-fragments/bitcoin.yml | 4 ++++ .../docker-fragments/btcpayserver.yml | 2 +- .../docker-fragments/litecoin-clightning.yml | 2 +- .../docker-fragments/litecoin-lnd.yml | 8 +++++--- .../docker-fragments/litecoin.yml | 4 ++++ 19 files changed, 105 insertions(+), 29 deletions(-) diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml index 58a6a96..75203e5 100644 --- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -63,13 +63,17 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" clightning_bitcoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml index 1045401..460e0a3 100644 --- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -70,14 +70,18 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" clightning_litecoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: @@ -111,13 +115,17 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" clightning_bitcoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml index a0a57a8..3f43a3c 100644 --- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml +++ b/Production-NoReverseProxy/docker-compose.btc-ltc.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -64,10 +64,14 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" bitcoind: @@ -80,9 +84,13 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" volumes: diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml index a91fb9d..8df42f2 100644 --- a/Production-NoReverseProxy/docker-compose.btc.yml +++ b/Production-NoReverseProxy/docker-compose.btc.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -60,9 +60,13 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" volumes: diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml index 04ebada..e29675f 100644 --- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml +++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -62,14 +62,18 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" clightning_litecoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml index 410e25e..ff13738 100644 --- a/Production-NoReverseProxy/docker-compose.ltc.yml +++ b/Production-NoReverseProxy/docker-compose.ltc.yml @@ -2,7 +2,7 @@ version: "3" services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -59,10 +59,14 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" volumes: diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml index 7a58a45..55d4bf5 100644 --- a/Production/docker-compose.btc-clightning.yml +++ b/Production/docker-compose.btc-clightning.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -105,13 +105,17 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" clightning_bitcoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml index 984ee55..3f594d6 100644 --- a/Production/docker-compose.btc-ltc-clightning.yml +++ b/Production/docker-compose.btc-ltc-clightning.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -112,14 +112,18 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" clightning_litecoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: @@ -153,13 +157,17 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" clightning_bitcoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml index bdf658e..2452d91 100644 --- a/Production/docker-compose.btc-ltc.yml +++ b/Production/docker-compose.btc-ltc.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -106,10 +106,14 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" bitcoind: @@ -122,9 +126,13 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" volumes: diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml index 6ca058e..3d569ac 100644 --- a/Production/docker-compose.btc.yml +++ b/Production/docker-compose.btc.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -102,9 +102,13 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "bitcoin_datadir:/data" volumes: diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml index 5e58b31..157b1be 100644 --- a/Production/docker-compose.ltc-clightning.yml +++ b/Production/docker-compose.ltc-clightning.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -104,14 +104,18 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" clightning_litecoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml index 7551060..060e9d3 100644 --- a/Production/docker-compose.ltc.yml +++ b/Production/docker-compose.ltc.yml @@ -46,7 +46,7 @@ services: - nginx-gen btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: @@ -101,10 +101,14 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" + - "28333" volumes: - "litecoin_datadir:/data" volumes: diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 31403e7..ceda8ec 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_bitcoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index b4eeedb..18a6bb2 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_bitcoin: - image: btcpayserver/lnd:0.4.2.0.1 + image: btcpayserver/lnd:0.5-beta container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: @@ -15,10 +15,12 @@ services: rpclisten=0.0.0.0:10009 bitcoin.node=bitcoind bitcoind.rpchost=bitcoind:43782 - bitcoind.zmqpath=tcp://bitcoind:28332 + bitcoind.zmqpubrawblock=tcp://bitcoind:28332 + bitcoind.zmqpubrawtx=tcp://bitcoind:28333 externalip=${BTCPAY_HOST}:9735 alias=${LIGHTNING_ALIAS} - noencryptwallet=1 + adminmacaroonpath=/data/admin.macaroon + noseedbackup=1 notls=1 ports: - "9735:9735" diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index f23221a..81ec724 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -11,9 +11,13 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" + - "28332" # ZMQ + - "28333" # ZMQ volumes: - "bitcoin_datadir:/data" nbxplorer: diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index b1ffc14..c9ac995 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver.yml @@ -4,7 +4,7 @@ services: btcpayserver: restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.105 + image: nicolasdorier/btcpayserver:1.0.2.106 expose: - "49392" environment: diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml index 602a566..8156e08 100644 --- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_litecoin: - image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c + image: nicolasdorier/clightning:v0.6.1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index be9ba0e..df68428 100644 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml @@ -2,7 +2,7 @@ version: "3" services: lnd_litecoin: - image: btcpayserver/lnd:0.4.2.0.1 + image: btcpayserver/lnd:0.5-beta container_name: btcpayserver_lnd_litecoin restart: unless-stopped environment: @@ -13,10 +13,12 @@ services: restlisten=0.0.0.0:8080 litecoin.node=litecoind litecoind.rpchost=litecoind:43782 - litecoind.zmqpath=tcp://litecoind:28332 + litecoind.zmqpubrawblock=tcp://litecoind:28332 + litecoind.zmqpubrawtx=tcp://litecoind:28333 externalip=${BTCPAY_HOST}:9736 alias=${LIGHTNING_ALIAS} - noencryptwallet=1 + adminmacaroonpath=/data/admin.macaroon + noseedbackup=1 notls=1 ports: - "9736:9735" diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml index 3391261..2d2d0b7 100644 --- a/docker-compose-generator/docker-fragments/litecoin.yml +++ b/docker-compose-generator/docker-fragments/litecoin.yml @@ -10,10 +10,14 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 + zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" + - "28332" # ZMQ + - "28333" # ZMQ volumes: - "litecoin_datadir:/data" nbxplorer: From 612d34d79e8f66987f0b7a8f38d9a9e2a0731d77 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 28 Sep 2018 17:32:52 +0900 Subject: [PATCH 3/5] bump --- docker-compose-generator/docker-fragments/bitcoin-lnd.yml | 2 +- docker-compose-generator/docker-fragments/bitcoin.yml | 4 ---- docker-compose-generator/docker-fragments/litecoin-lnd.yml | 3 ++- docker-compose-generator/docker-fragments/litecoin.yml | 4 ---- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 18a6bb2..74931cc 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml @@ -47,8 +47,8 @@ services: bitcoind: environment: BITCOIN_EXTRA_ARGS: | - zmqpubrawtx=tcp://0.0.0.0:28332 zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "28332" - "28333" diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 81ec724..f23221a 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -11,13 +11,9 @@ services: ${NBITCOIN_NETWORK:-regtest}=1 port=39388 whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "43782" - "39388" - - "28332" # ZMQ - - "28333" # ZMQ volumes: - "bitcoin_datadir:/data" nbxplorer: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index df68428..ed96f06 100644 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/litecoin-lnd.yml @@ -44,10 +44,11 @@ services: litecoind: environment: BITCOIN_EXTRA_ARGS: | - zmqpubrawtx=tcp://0.0.0.0:28332 zmqpubrawblock=tcp://0.0.0.0:28332 + zmqpubrawtx=tcp://0.0.0.0:28333 expose: - "28332" + - "28333" volumes: lnd_litecoin_datadir: \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml index 2d2d0b7..3391261 100644 --- a/docker-compose-generator/docker-fragments/litecoin.yml +++ b/docker-compose-generator/docker-fragments/litecoin.yml @@ -10,14 +10,10 @@ services: rpcport=43782 ${NBITCOIN_NETWORK:-regtest}=1 port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 whitelist=0.0.0.0/0 expose: - "43782" - "39388" - - "28332" # ZMQ - - "28333" # ZMQ volumes: - "litecoin_datadir:/data" nbxplorer: From 9acb5d8067cb5c46f59858137feb699b41ac9f19 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 29 Sep 2018 13:26:07 +0900 Subject: [PATCH 4/5] Fix macaroonpath for utilities --- bitcoin-lncli.ps1 | 2 +- bitcoin-lncli.sh | 2 +- litecoin-lncli.ps1 | 2 +- litecoin-lncli.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitcoin-lncli.ps1 b/bitcoin-lncli.ps1 index f42a002..f40e82e 100755 --- a/bitcoin-lncli.ps1 +++ b/bitcoin-lncli.ps1 @@ -1 +1 @@ -docker exec -ti btcpayserver_lnd_bitcoin lncli $args +docker exec -ti btcpayserver_lnd_bitcoin lncli --macaroonpath /root/.lnd/admin.macaroon $args diff --git a/bitcoin-lncli.sh b/bitcoin-lncli.sh index e94deb1..34b1b55 100755 --- a/bitcoin-lncli.sh +++ b/bitcoin-lncli.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker exec -ti btcpayserver_lnd_bitcoin lncli "$@" +docker exec -ti btcpayserver_lnd_bitcoin lncli --macaroonpath /root/.lnd/admin.macaroon "$@" diff --git a/litecoin-lncli.ps1 b/litecoin-lncli.ps1 index 5eea0cc..e286ac9 100755 --- a/litecoin-lncli.ps1 +++ b/litecoin-lncli.ps1 @@ -1 +1 @@ -docker exec -ti btcpayserver_lnd_litecoin lncli $args +docker exec -ti btcpayserver_lnd_litecoin lncli --macaroonpath /root/.lnd/admin.macaroon $args diff --git a/litecoin-lncli.sh b/litecoin-lncli.sh index c2bb713..5178674 100755 --- a/litecoin-lncli.sh +++ b/litecoin-lncli.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker exec -ti btcpayserver_lnd_litecoin lncli "$@" +docker exec -ti btcpayserver_lnd_litecoin lncli --macaroonpath /root/.lnd/admin.macaroon "$@" From 612d8ec6f0ddaf203b849dc1b15dbeb826965fca Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Sat, 29 Sep 2018 21:56:08 +0900 Subject: [PATCH 5/5] Remove legacy pregen docker compose --- Production-NoReverseProxy/README.md | 15 +- .../docker-compose.btc-clightning.yml | 105 --------- .../docker-compose.btc-ltc-clightning.yml | 159 -------------- .../docker-compose.btc-ltc.yml | 101 --------- .../docker-compose.btc.yml | 76 ------- .../docker-compose.ltc-clightning.yml | 105 --------- .../docker-compose.ltc.yml | 76 ------- Production/README.md | 18 +- Production/docker-compose.btc-clightning.yml | 151 ------------- .../docker-compose.btc-ltc-clightning.yml | 205 ------------------ Production/docker-compose.btc-ltc.yml | 147 ------------- Production/docker-compose.btc.yml | 122 ----------- Production/docker-compose.ltc-clightning.yml | 151 ------------- Production/docker-compose.ltc.yml | 122 ----------- README.md | 5 +- btcpay-setup.sh | 49 +---- btcpay-update.sh | 5 + build-pregen.ps1 | 7 - build-pregen.sh | 8 - docker-compose-generator/src/Program.cs | 83 ++----- 20 files changed, 39 insertions(+), 1671 deletions(-) delete mode 100644 Production-NoReverseProxy/docker-compose.btc-clightning.yml delete mode 100644 Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml delete mode 100644 Production-NoReverseProxy/docker-compose.btc-ltc.yml delete mode 100644 Production-NoReverseProxy/docker-compose.btc.yml delete mode 100644 Production-NoReverseProxy/docker-compose.ltc-clightning.yml delete mode 100644 Production-NoReverseProxy/docker-compose.ltc.yml delete mode 100644 Production/docker-compose.btc-clightning.yml delete mode 100644 Production/docker-compose.btc-ltc-clightning.yml delete mode 100644 Production/docker-compose.btc-ltc.yml delete mode 100644 Production/docker-compose.btc.yml delete mode 100644 Production/docker-compose.ltc-clightning.yml delete mode 100644 Production/docker-compose.ltc.yml delete mode 100755 build-pregen.ps1 delete mode 100755 build-pregen.sh diff --git a/Production-NoReverseProxy/README.md b/Production-NoReverseProxy/README.md index 25de599..6a7bc47 100644 --- a/Production-NoReverseProxy/README.md +++ b/Production-NoReverseProxy/README.md @@ -1,17 +1,4 @@ -# About those pre-generated docker-compose - -All `docker-compose` files in this folder are generated by running the [build-pregen.sh](build-pregen.sh) (or [build-pregen.ps1](build-pregen.ps1)) script from the fragments located in [docker-compose-generator/docker-fragments](docker-compose-generator/docker-fragments). - -The pre-generated `docker-compose` files only cover `btc`, `ltc`, `clightning` without reverse proxy. - ---- - -We strongly advise you to not use the pre-generated docker-compose of this folder, they are deprecated and kept only for backward compatibility. -Instead use the [build.sh](../build.sh) as documented in (README)(../Readme.md) to generate a docker-compose which fit your needs. - ---- - -This `docker-compose` files can be used for production purpose. +# How to use docker-compose without reverse proxy ![Architecture](https://github.com/btcpayserver/btcpayserver-doc/raw/master/img/Architecture.png) diff --git a/Production-NoReverseProxy/docker-compose.btc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-clightning.yml deleted file mode 100644 index 75203e5..0000000 --- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml +++ /dev/null @@ -1,105 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_bitcoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_bitcoin_datadir:/etc/clightning_bitcoin" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "bitcoin_datadir:/root/.bitcoin" - links: - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" - clightning_bitcoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_bitcoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: btc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind - announce-addr=${BTCPAY_HOST}:9735 - bind-addr=0.0.0.0:9735 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=btc - volumes: - - "clightning_bitcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/bitcoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9735:9735" - links: - - nbxplorer - - bitcoind -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - bitcoin_datadir: - clightning_bitcoin_datadir: diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml deleted file mode 100644 index 460e0a3..0000000 --- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml +++ /dev/null @@ -1,159 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc,btc" - BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_litecoin - - clightning_bitcoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_litecoin_datadir:/etc/clightning_litecoin" - - "clightning_bitcoin_datadir:/etc/clightning_bitcoin" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc,btc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - - "bitcoin_datadir:/root/.bitcoin" - links: - - litecoind - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - clightning_litecoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_litecoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: ltc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/litecoin - bitcoin-rpcconnect=litecoind - bind-addr=0.0.0.0:9735 - announce-addr=${BTCPAY_HOST}:9736 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=ltc - volumes: - - "clightning_litecoin_datadir:/root/.lightning" - - "litecoin_datadir:/etc/litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9736:9735" - links: - - nbxplorer - - litecoind - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" - clightning_bitcoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_bitcoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: btc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind - announce-addr=${BTCPAY_HOST}:9735 - bind-addr=0.0.0.0:9735 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=btc - volumes: - - "clightning_bitcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/bitcoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9735:9735" - links: - - nbxplorer - - bitcoind -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - clightning_litecoin_datadir: - bitcoin_datadir: - clightning_bitcoin_datadir: diff --git a/Production-NoReverseProxy/docker-compose.btc-ltc.yml b/Production-NoReverseProxy/docker-compose.btc-ltc.yml deleted file mode 100644 index 3f43a3c..0000000 --- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml +++ /dev/null @@ -1,101 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc,btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc,btc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - - "bitcoin_datadir:/root/.bitcoin" - links: - - litecoind - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - bitcoin_datadir: diff --git a/Production-NoReverseProxy/docker-compose.btc.yml b/Production-NoReverseProxy/docker-compose.btc.yml deleted file mode 100644 index 8df42f2..0000000 --- a/Production-NoReverseProxy/docker-compose.btc.yml +++ /dev/null @@ -1,76 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "bitcoin_datadir:/root/.bitcoin" - links: - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - bitcoin_datadir: diff --git a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml deleted file mode 100644 index e29675f..0000000 --- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml +++ /dev/null @@ -1,105 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc" - BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_litecoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_litecoin_datadir:/etc/clightning_litecoin" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - links: - - litecoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - clightning_litecoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_litecoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: ltc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/litecoin - bitcoin-rpcconnect=litecoind - bind-addr=0.0.0.0:9735 - announce-addr=${BTCPAY_HOST}:9736 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=ltc - volumes: - - "clightning_litecoin_datadir:/root/.lightning" - - "litecoin_datadir:/etc/litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9736:9735" - links: - - nbxplorer - - litecoind -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - clightning_litecoin_datadir: diff --git a/Production-NoReverseProxy/docker-compose.ltc.yml b/Production-NoReverseProxy/docker-compose.ltc.yml deleted file mode 100644 index ff13738..0000000 --- a/Production-NoReverseProxy/docker-compose.ltc.yml +++ /dev/null @@ -1,76 +0,0 @@ -version: "3" -services: - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc" - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "80:49392" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - links: - - litecoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" -volumes: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: diff --git a/Production/README.md b/Production/README.md index 5f4868a..02a94bb 100644 --- a/Production/README.md +++ b/Production/README.md @@ -1,19 +1,7 @@ -# About those docker-compose +# How to use docker-compose with NGinx -All `docker-compose` files in [Production](Production) and [Production-NoReverseProxy](Production-NoReverseProxy) are generated by running the [build-pregen.sh](build-pregen.sh) (or [build-pregen.ps1](build-pregen.ps1)) script from the fragments located in [docker-compose-generator/docker-fragments](docker-compose-generator/docker-fragments). - -The pre-generated `docker-compose` files only cover `btc`, `ltc`, `clightning` with `nginx`. - ---- - -We strongly advise you to not use the pre-generated docker-compose of this folder, they are deprecated and kept only for backward compatibility. -Instead use the [build.sh](../build.sh) as documented in (README)(../Readme.md) to generate a docker-compose which fit your needs. - ---- - -The `docker-compose` can be used for production purpose. - -It is composed of: +NGinx acts as a reverse proxy, and take care of renewing HTTPS certificates for you. +BTCPay Server deployment using NGinx are typically composed of: 1. One full node per supported cryptocurrency (bitcoind/litecoind) 2. A lightweight block explorer ([NBxplorer](https://github.com/dgarage/NBXplorer)) diff --git a/Production/docker-compose.btc-clightning.yml b/Production/docker-compose.btc-clightning.yml deleted file mode 100644 index 55d4bf5..0000000 --- a/Production/docker-compose.btc-clightning.yml +++ /dev/null @@ -1,151 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_bitcoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_bitcoin_datadir:/etc/clightning_bitcoin" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "bitcoin_datadir:/root/.bitcoin" - links: - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" - clightning_bitcoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_bitcoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: btc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind - announce-addr=${BTCPAY_HOST}:9735 - bind-addr=0.0.0.0:9735 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=btc - volumes: - - "clightning_bitcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/bitcoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9735:9735" - links: - - nbxplorer - - bitcoind -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - bitcoin_datadir: - clightning_bitcoin_datadir: diff --git a/Production/docker-compose.btc-ltc-clightning.yml b/Production/docker-compose.btc-ltc-clightning.yml deleted file mode 100644 index 3f594d6..0000000 --- a/Production/docker-compose.btc-ltc-clightning.yml +++ /dev/null @@ -1,205 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc,btc" - BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_litecoin - - clightning_bitcoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_litecoin_datadir:/etc/clightning_litecoin" - - "clightning_bitcoin_datadir:/etc/clightning_bitcoin" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc,btc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - - "bitcoin_datadir:/root/.bitcoin" - links: - - litecoind - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - clightning_litecoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_litecoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: ltc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/litecoin - bitcoin-rpcconnect=litecoind - bind-addr=0.0.0.0:9735 - announce-addr=${BTCPAY_HOST}:9736 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=ltc - volumes: - - "clightning_litecoin_datadir:/root/.lightning" - - "litecoin_datadir:/etc/litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9736:9735" - links: - - nbxplorer - - litecoind - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" - clightning_bitcoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_bitcoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: btc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/bitcoin - bitcoin-rpcconnect=bitcoind - announce-addr=${BTCPAY_HOST}:9735 - bind-addr=0.0.0.0:9735 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=btc - volumes: - - "clightning_bitcoin_datadir:/root/.lightning" - - "bitcoin_datadir:/etc/bitcoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9735:9735" - links: - - nbxplorer - - bitcoind -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - clightning_litecoin_datadir: - bitcoin_datadir: - clightning_bitcoin_datadir: diff --git a/Production/docker-compose.btc-ltc.yml b/Production/docker-compose.btc-ltc.yml deleted file mode 100644 index 2452d91..0000000 --- a/Production/docker-compose.btc-ltc.yml +++ /dev/null @@ -1,147 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc,btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc,btc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - - "bitcoin_datadir:/root/.bitcoin" - links: - - litecoind - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - bitcoin_datadir: diff --git a/Production/docker-compose.btc.yml b/Production/docker-compose.btc.yml deleted file mode 100644 index 3d569ac..0000000 --- a/Production/docker-compose.btc.yml +++ /dev/null @@ -1,122 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "bitcoin_datadir:/root/.bitcoin" - links: - - bitcoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: nicolasdorier/docker-bitcoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "bitcoin_datadir:/data" -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - bitcoin_datadir: diff --git a/Production/docker-compose.ltc-clightning.yml b/Production/docker-compose.ltc-clightning.yml deleted file mode 100644 index 157b1be..0000000 --- a/Production/docker-compose.ltc-clightning.yml +++ /dev/null @@ -1,151 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc" - BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc" - links: - - nbxplorer - - postgres - - clightning_litecoin - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "clightning_litecoin_datadir:/etc/clightning_litecoin" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - links: - - litecoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" - clightning_litecoin: - image: nicolasdorier/clightning:v0.6.1 - container_name: btcpayserver_clightning_litecoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: ltc - LIGHTNINGD_EXPLORERURL: "http://nbxplorer:32838/" - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/litecoin - bitcoin-rpcconnect=litecoind - bind-addr=0.0.0.0:9735 - announce-addr=${BTCPAY_HOST}:9736 - network=${NBITCOIN_NETWORK:-regtest} - alias=${LIGHTNING_ALIAS} - chain=ltc - volumes: - - "clightning_litecoin_datadir:/root/.lightning" - - "litecoin_datadir:/etc/litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9736:9735" - links: - - nbxplorer - - litecoind -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: - clightning_litecoin_datadir: diff --git a/Production/docker-compose.ltc.yml b/Production/docker-compose.ltc.yml deleted file mode 100644 index 060e9d3..0000000 --- a/Production/docker-compose.ltc.yml +++ /dev/null @@ -1,122 +0,0 @@ -version: "3" -services: - nginx: - restart: unless-stopped - image: nginx:stable - container_name: nginx - ports: - - "80:80" - - "443:443" - volumes: - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - links: - - btcpayserver - nginx-gen: - restart: unless-stopped - image: jwilder/docker-gen - container_name: nginx-gen - volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:ro" - entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - links: - - nginx - letsencrypt-nginx-proxy-companion: - restart: unless-stopped - image: jrcs/letsencrypt-nginx-proxy-companion - container_name: letsencrypt-nginx-proxy-companion - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" - - "nginx_conf:/etc/nginx/conf.d" - - "nginx_vhost:/etc/nginx/vhost.d" - - "nginx_html:/usr/share/nginx/html" - - "nginx_certs:/etc/nginx/certs:rw" - environment: - NGINX_DOCKER_GEN_CONTAINER: "nginx-gen" - NGINX_PROXY_CONTAINER: "nginx" - ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory} - links: - - nginx-gen - btcpayserver: - restart: unless-stopped - image: nicolasdorier/btcpayserver:1.0.2.106 - expose: - - "49392" - environment: - BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver${NBITCOIN_NETWORK:-regtest} - BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BTCPAY_BIND: 0.0.0.0:49392 - BTCPAY_EXTERNALURL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/ - BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} - BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} - VIRTUAL_NETWORK: nginx-proxy - VIRTUAL_PORT: 49392 - VIRTUAL_HOST: ${BTCPAY_HOST} - SSL_POLICY: Mozilla-Modern - LETSENCRYPT_HOST: ${BTCPAY_HOST} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc" - links: - - nbxplorer - - postgres - volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - nbxplorer: - restart: unless-stopped - image: nicolasdorier/nbxplorer:1.0.2.31 - expose: - - "32838" - environment: - NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} - NBXPLORER_BIND: 0.0.0.0:32838 - NBXPLORER_CHAINS: "ltc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - volumes: - - "nbxplorer_datadir:/datadir" - - "litecoin_datadir:/root/.litecoin" - links: - - litecoind - postgres: - restart: unless-stopped - image: postgres:9.6.5 - volumes: - - "postgres_datadir:/var/lib/postgresql/data" - litecoind: - restart: unless-stopped - container_name: btcpayserver_litecoind - image: nicolasdorier/docker-litecoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - zmqpubrawblock=tcp://0.0.0.0:28332 - zmqpubrawtx=tcp://0.0.0.0:28333 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - - "28332" - - "28333" - volumes: - - "litecoin_datadir:/data" -volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: - postgres_datadir: - btcpay_datadir: - nbxplorer_datadir: - litecoin_datadir: diff --git a/README.md b/README.md index 277e5a1..9dcc178 100644 --- a/README.md +++ b/README.md @@ -306,9 +306,12 @@ Yes, run the following commands to update: ```bash sudo su - -btcpay-update.sh cd $DOWNLOAD_ROOT/btcpayserver-docker +git checkout 9acb5d8067cb5c46f59858137feb699b41ac9f19 +btcpay-update.sh . ./btcpay-setup.sh -i +git checkout master +btcpay-update.sh exit ``` diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 79fd939..21a1edc 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -71,53 +71,8 @@ fi ######### Migration: old pregen environment to new environment ############ if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN_OLD_PREGEN ]; then - echo "Old pregen docker deployment detected. Migrating..." - rm "$DOWNLOAD_ROOT/btcpay-restart.sh" - rm "$DOWNLOAD_ROOT/btcpay-update.sh" - rm "$DOWNLOAD_ROOT/changedomain.sh" - rm "$DOWNLOAD_ROOT/entrypoint.sh" - DOWNLOAD_ROOT="" - BTCPAYGEN_OLD_PREGEN="true" - # Migration: old deployment store those in BTCPAY_ENV_FILE - BTCPAY_HOST=$(cat $BTCPAY_ENV_FILE | sed -n 's/^BTCPAY_HOST=\(.*\)$/\1/p') - ACME_CA_URI=$(cat $BTCPAY_ENV_FILE | sed -n 's/^ACME_CA_URI=\(.*\)$/\1/p') - NBITCOIN_NETWORK=$(cat $BTCPAY_ENV_FILE | sed -n 's/^NBITCOIN_NETWORK=\(.*\)$/\1/p') - LETSENCRYPT_EMAIL=$(cat $BTCPAY_ENV_FILE | sed -n 's/^LETSENCRYPT_EMAIL=\(.*\)$/\1/p') - LIGHTNING_ALIAS=$(cat $BTCPAY_ENV_FILE | sed -n 's/^LIGHTNING_ALIAS=\(.*\)$/\1/p') - - if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production ]]; then - BTCPAYGEN_REVERSEPROXY='nginx' - fi - if [[ $(dirname $BTCPAY_DOCKER_COMPOSE) == *Production-NoReverseProxy ]]; then - BTCPAYGEN_REVERSEPROXY='none' - fi - - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.btc.yml ]]; then - BTCPAYGEN_CRYPTO1='btc' - BTCPAYGEN_LIGHTNING='none' - fi - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.btc-clightning.yml ]]; then - BTCPAYGEN_CRYPTO1='btc' - BTCPAYGEN_LIGHTNING='clightning' - fi - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.ltc.yml ]]; then - BTCPAYGEN_CRYPTO1='ltc' - BTCPAYGEN_LIGHTNING='none' - fi - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.ltc-clightning.yml ]]; then - BTCPAYGEN_CRYPTO1='ltc' - BTCPAYGEN_LIGHTNING='clightning' - fi - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.btc-ltc.yml ]]; then - BTCPAYGEN_CRYPTO1='btc' - BTCPAYGEN_CRYPTO2='ltc' - BTCPAYGEN_LIGHTNING='none' - fi - if [[ $BTCPAY_DOCKER_COMPOSE == *docker-compose.btc-ltc-clightning.yml ]]; then - BTCPAYGEN_CRYPTO1='btc' - BTCPAYGEN_CRYPTO2='ltc' - BTCPAYGEN_LIGHTNING='clightning' - fi + echo "Your deployment is too old, you need to migrate by following instructions on this link https://github.com/btcpayserver/btcpayserver-docker/tree/master#i-deployed-before-btcpay-setupsh-existed-before-may-17-can-i-migrate-to-this-new-system" + return fi ######################################################### diff --git a/btcpay-update.sh b/btcpay-update.sh index 5b6819b..327ab25 100755 --- a/btcpay-update.sh +++ b/btcpay-update.sh @@ -4,6 +4,11 @@ set -e . /etc/profile.d/btcpay-env.sh +if [ ! -z $BTCPAY_DOCKER_COMPOSE ] && [ ! -z $DOWNLOAD_ROOT ] && [ -z $BTCPAYGEN_OLD_PREGEN ]; then + echo "Your deployment is too old, you need to migrate by following instructions on this link https://github.com/btcpayserver/btcpayserver-docker/tree/master#i-deployed-before-btcpay-setupsh-existed-before-may-17-can-i-migrate-to-this-new-system" + exit +fi + cd "$BTCPAY_BASE_DIRECTORY/btcpayserver-docker" git pull --force diff --git a/build-pregen.ps1 b/build-pregen.ps1 deleted file mode 100755 index b8faf78..0000000 --- a/build-pregen.ps1 +++ /dev/null @@ -1,7 +0,0 @@ -# This script will run docker-compose-generator in a container to generate the yml files - -docker pull btcpayserver/docker-compose-generator -docker run -v "$(Get-Location)\Production:/app/Production" ` - -v "$(Get-Location)\Production-NoReverseProxy:/app/Production-NoReverseProxy" ` - -v "$(Get-Location)\docker-compose-generator\docker-fragments:/app/docker-fragments" ` - --rm btcpayserver/docker-compose-generator pregen \ No newline at end of file diff --git a/build-pregen.sh b/build-pregen.sh deleted file mode 100755 index 27fe54c..0000000 --- a/build-pregen.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -# This script will run docker-compose-generator in a container to generate the yml files -docker pull btcpayserver/docker-compose-generator -docker run -v "$(pwd)/Production:/app/Production" \ - -v "$(pwd)/Production-NoReverseProxy:/app/Production-NoReverseProxy" \ - -v "$(pwd)/docker-compose-generator/docker-fragments:/app/docker-fragments" \ - --rm btcpayserver/docker-compose-generator pregen diff --git a/docker-compose-generator/src/Program.cs b/docker-compose-generator/src/Program.cs index 9d0d293..f47f7a9 100644 --- a/docker-compose-generator/src/Program.cs +++ b/docker-compose-generator/src/Program.cs @@ -14,50 +14,15 @@ namespace DockerGenerator var root = Environment.GetEnvironmentVariable("INSIDE_CONTAINER") == "1" ? FindRoot("app") : Path.GetFullPath(Path.Combine(FindRoot("docker-compose-generator"), "..")); - if(args.Any(a => a == "pregen")) - { - var productionLocation = Path.GetFullPath(Path.Combine(root, "Production")); - var testLocation = Path.GetFullPath(Path.Combine(root, "Production-NoReverseProxy")); - - foreach(var proxy in new[] { "nginx", "no-reverseproxy" }) - { - foreach(var lightning in new[] { "clightning", "" }) - { - foreach(var btc in new[] { "btc", "" }) - { - foreach(var ltc in new[] { "ltc", "" }) - { - if(btc == "" && ltc == "") - continue; - string name = $"{btc}-{ltc}-{lightning}".Replace("--", "-"); - if(name.EndsWith("-")) - name = name.Substring(0, name.Length - 1); - if(name.StartsWith("-")) - name = name.Substring(1, name.Length - 1); - var composition = new DockerComposition(); - composition.SelectedCryptos = new HashSet(); - composition.SelectedCryptos.Add(btc); - composition.SelectedCryptos.Add(ltc); - composition.SelectedLN = lightning; - composition.SelectedProxy = proxy; - new Program().Run(composition, name, proxy == "nginx" ? productionLocation : testLocation); - } - } - } - } - } - else - { - var composition = DockerComposition.FromEnvironmentVariables(); - Console.WriteLine("Crypto: " + string.Join(", ", composition.SelectedCryptos.ToArray())); - Console.WriteLine("Lightning: " + composition.SelectedLN); - Console.WriteLine("ReverseProxy: " + composition.SelectedProxy); - var generatedLocation = Path.GetFullPath(Path.Combine(root, "Generated")); + var composition = DockerComposition.FromEnvironmentVariables(); + Console.WriteLine("Crypto: " + string.Join(", ", composition.SelectedCryptos.ToArray())); + Console.WriteLine("Lightning: " + composition.SelectedLN); + Console.WriteLine("ReverseProxy: " + composition.SelectedProxy); + var generatedLocation = Path.GetFullPath(Path.Combine(root, "Generated")); - var name = Environment.GetEnvironmentVariable("BTCPAYGEN_SUBNAME"); - name = string.IsNullOrEmpty(name) ? "generated" : name; - new Program().Run(composition, name, generatedLocation); - } + var name = Environment.GetEnvironmentVariable("BTCPAYGEN_SUBNAME"); + name = string.IsNullOrEmpty(name) ? "generated" : name; + new Program().Run(composition, name, generatedLocation); } private void Run(DockerComposition composition, string name, string output) @@ -67,7 +32,7 @@ namespace DockerGenerator fragmentLocation = Path.GetFullPath(Path.Combine(fragmentLocation, "docker-fragments")); var fragments = new List(); - if(composition.SelectedProxy == "nginx") + if (composition.SelectedProxy == "nginx") { fragments.Add("nginx"); } @@ -76,26 +41,26 @@ namespace DockerGenerator fragments.Add("btcpayserver-noreverseproxy"); } fragments.Add("btcpayserver"); - foreach(var crypto in CryptoDefinition.GetDefinitions()) + foreach (var crypto in CryptoDefinition.GetDefinitions()) { - if(!composition.SelectedCryptos.Contains(crypto.Crypto)) + if (!composition.SelectedCryptos.Contains(crypto.Crypto)) continue; fragments.Add(crypto.CryptoFragment); - if(composition.SelectedLN == "clightning" && crypto.CLightningFragment != null) + if (composition.SelectedLN == "clightning" && crypto.CLightningFragment != null) { fragments.Add(crypto.CLightningFragment); } - if(composition.SelectedLN == "lnd" && crypto.LNDFragment != null) - { - fragments.Add(crypto.LNDFragment); - } - } + if (composition.SelectedLN == "lnd" && crypto.LNDFragment != null) + { + fragments.Add(crypto.LNDFragment); + } + } - foreach(var fragment in composition.AdditionalFragments) - { - fragments.Add(fragment.Trim()); - } + foreach (var fragment in composition.AdditionalFragments) + { + fragments.Add(fragment.Trim()); + } var def = new DockerComposeDefinition(name, fragments); def.FragmentLocation = fragmentLocation; @@ -107,11 +72,11 @@ namespace DockerGenerator { string directory = Directory.GetCurrentDirectory(); int i = 0; - while(true) + while (true) { - if(i > 10) + if (i > 10) throw new DirectoryNotFoundException(rootDirectory); - if(directory.EndsWith(rootDirectory)) + if (directory.EndsWith(rootDirectory)) return directory; directory = Path.GetFullPath(Path.Combine(directory, "..")); i++;