diff --git a/.gitignore b/.gitignore index 917c263..1e8d83c 100644 --- a/.gitignore +++ b/.gitignore @@ -303,3 +303,6 @@ Generated/error /Generated/save-images.sh + +# DS_Store ignore +.DS_Store diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index a2c3f99..538268c 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -40,9 +40,8 @@ } {{ end }} {{ if (eq $serviceName "bitcoin_thub") }} - location /thub/ { - rewrite ^/thub(.*)$ $1 break; - proxy_pass http://bitcoin_thub:3000/; + location /thub { + proxy_pass http://bitcoin_thub:3000/thub; } {{ end }} {{ if (eq $serviceName "btcqbo") }} @@ -539,3 +538,6 @@ server { {{ end }} {{ end }} {{ end }} +{{ if $.Env.ADDITIONAL_NGINX_CONFIG }} +{{ $.Env.ADDITIONAL_NGINX_CONFIG}} +{{ end }} \ No newline at end of file diff --git a/README.md b/README.md index 9de77ae..d8e46a6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Note: The setup process can be time consuming, but is heavily automated to make Take a look at how BTCPay works in a video below. -[![](https://raw.githubusercontent.com/btcpayserver/btcpayserver-doc/master/img/thumbnails/HowBTCPayServerWorks.png)](https://www.youtube.com/watch?v=nr0UNbz3AoQ) +[![](https://img.youtube.com/vi/nr0UNbz3AoQ/hqdefault.jpg)](https://www.youtube.com/watch?v=nr0UNbz3AoQ) Here is a presentation of the global architecture at Advancing Bitcoin conference. @@ -84,7 +84,7 @@ exit Video below guides you step by step on how to set up BTCPay Server on a VPS with Docker. -[![](https://raw.githubusercontent.com/btcpayserver/btcpayserver-doc/master/img/thumbnails/BTCPayDockerDeploymentVPS.png)](https://www.youtube.com/watch?v=x6hqTFgHqhA) +[![](https://img.youtube.com/vi/x6hqTFgHqhA/hqdefault.jpg)](https://www.youtube.com/watch?v=x6hqTFgHqhA) Check out this video if you're interested in learning more about setting up [BTCPay with Docker Compose](https://www.youtube.com/playlist?list=PLH4m2oS2ratfaprAFx9E3ZDjwxNKvCk4e). @@ -154,6 +154,7 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-save-storage-xs](docker-compose-generator/docker-fragments/opt-save-storage-xs.yml) will keep around 3 months of blocks (prune BTC for 25 GB) * [opt-save-storage-xxs](docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml) will keep around 2 weeks of blocks (prune BTC for 5 GB) (lightning not supported) * [opt-lnd-autopilot](docker-compose-generator/docker-fragments/opt-lnd-autopilot.yml) will activate auto pilot on LND. (5 channels, 60% of allocation) +* [opt-lnd-keysend](docker-compose-generator/docker-fragments/opt-lnd-keysend.yml) will activate keysend on LND. * [opt-save-memory](docker-compose-generator/docker-fragments/opt-save-memory.yml) will decrease the default dbcache at the expense of longer synchronization time. (Useful if your machine is less than 2GB) * [opt-more-memory](docker-compose-generator/docker-fragments/opt-more-memory.yml) will increase the default dbcache to make synchronization faster (Useful if your machine is has around 4GB) * [opt-add-btcqbo](docker-compose-generator/docker-fragments/opt-add-btcqbo.yml) will allow you to create an invoice on Quickbooks which include a way for your customer to pay on BTCPay Server (More information on this [github repository](https://github.com/JeffVandrewJr/btcqbo/), this add-on is maintained by [JeffVandrewJr](https://github.com/JeffVandrewJr), see more on [this video](https://www.youtube.com/watch?v=srgwL9ozg6c)) @@ -161,16 +162,18 @@ Available `BTCPAYGEN_ADDITIONAL_FRAGMENTS` currently are: * [opt-add-woocommerce](docker-compose-generator/docker-fragments/opt-add-woocommerce.yml), for a self-hosted woocommerce with BTCPay Server plugin pre installed. * [opt-add-tor](docker-compose-generator/docker-fragments/opt-add-tor.yml), for exposing BTCPayServer, Woocommerce, your lightning nodes as hidden services and accept onion peers for your full node. Warning: This options is for working around NAT and firewall problems as well as to help protect your customer's privacy. This will not protect your privacy against a targeted attack against you. * [opt-add-btctransmuter](docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml), for a self-hosted IFTTT style service for crypto services such as fiat settlement. (More information on this [github repository](https://github.com/btcpayserver/btcTransmuter/) -* [opt-txindex](docker-compose-generator/docker-fragments/opt-txindex.yml), to enable txindex=1 in bitcoin.conf if you require txindexing for Bisq, DOJO, Esplora, etc. -* [opt-unsafe-expose](docker-compose-generator/docker-fragments/opt-expose-unsafe.yml), to unsafely expose bitcoind P2P port 8333 if you require P2P for Bisq, DOJO, Esplora, etc. WARNING: ONLY USE ON TRUSTED LAN OR WITH FIREWALL RULES WHITELISTING SPECIFIC HOSTS -* [opt-add-tor-relay](docker-compose-generator/docker-fragments/opt-add-tor-relay.yml), for a non-exit tor relay. Make sure to have ports 9001 and 9030 accessible externally. [Please read the legal implications of running a tor relay](https://www.eff.org/torchallenge/faq.html) and [what resources are used to operate the relay](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#RelayRequirements). +* [opt-txindex](docker-compose-generator/docker-fragments/opt-txindex.yml), to enable txindex=1 in bitcoin.conf if you require txindexing for Bisq, DOJO, etc. +* [opt-expose-unsafe](docker-compose-generator/docker-fragments/opt-expose-unsafe.yml), to unsafely expose bitcoind P2P port 8333 if you require P2P for Bisq, DOJO, Esplora, etc. WARNING: ONLY USE ON TRUSTED LAN OR WITH FIREWALL RULES WHITELISTING SPECIFIC HOSTS +* [opt-add-tor-relay](docker-compose-generator/docker-fragments/opt-add-tor-relay.yml), for a non-exit tor relay. Make sure to have ports 9001 and 9030 accessible externally. [Please read the legal implications of running a tor relay](https://community.torproject.org/relay/community-resources/eff-tor-legal-faq) and [what resources are used to operate the relay](https://trac.torproject.org/projects/tor/wiki/TorRelayGuide#RelayRequirements). * [opt-add-electrumx](docker-compose-generator/docker-fragments/opt-add-electrumx.yml), to integrate a full ElectrumX server (from official source) with BTCPay, using the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet. You can also open port 50002 up to the internet on your router etc, to be part of the ElectrumX network, helping other Electrum wallet users to get connected. The bitcoin option `-txindex` is mandatory for ElectrumX, and this fragment will enable it on your BTCPay server automatically - NO need to use the fragment opt-txindex.yml. * [opt-add-electrum-ps](docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml), to integrate Electrum Personal Server (EPS) with BTCPay (EPS is a single-user alternative to the ElectrumX Server option above). EPS will also use the BTCPay server's full bitcoin node for complete privacy when using your own Electrum wallet, for your own personal use (i.e. other users cannot use your server to verify transactions). Also, the bitcoin option `-txindex` is NOT mandatory for EPS, and it will run on a pruned node (unlike ElectrumX). You will need to add your XPUB/YPUB/ZPUB as environment variable `EPS_XPUB` before enabling EPS for the first time (see above section on environment variables, and see [full documentation](https://docs.btcpayserver.org/ElectrumPersonalServer/) for details). * [opt-add-configurator](docker-compose-generator/docker-fragments/opt-add-configurator.yml), to integrate the [BTCPay Server Configurator](https://install.btcpayserver.org) to manage your BTCPay deployment through a UI, and to allow new deployments elsewhere easily. * [opt-add-pihole](docker-compose-generator/docker-fragments/opt-add-pihole.yml) ([See the documentation](docs/pihole.md)) +* [opt-add-ndlc](docker-compose-generator/docker-fragments/opt-add-ndlc.yml) ([See the documentation](docs/ndlc.md)) * [opt-add-thunderhub](docker-compose-generator/docker-fragments/opt-add-thunderhub.yml) for a LND Lightning Node Manager in your Browser. Maintained by [apotdevin](https://github.com/apotdevin). * [opt-add-teos](docker-compose-generator/docker-fragments/opt-add-teos.yml) for [The Eye Of Satoshi](https://github.com/talaia-labs/python-teos), a BOLT13 Lightning Watchtower. Use port 9814 on your server or Tor to connect. * [opt-add-zammad](docker-compose-generator/docker-fragments/opt-add-zammad.yml) for [Zammad](https://zammad.com/features), a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails +* [opt-monero-expose](docker-compose-generator/docker-fragments/opt-monero-expose.yml) to expose monero node's RPC port at 127.0.0.1:18081 to connect your own wallet. Use f.e. ssh port forwarding to forward to your own computer. You can also create your own [custom fragments](#how-can-i-customize-the-generated-docker-compose-file). @@ -319,50 +322,51 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H |---|---|:-:|:-:|:-:|:-:| | btcpayserver/docker-compose-generator | latest | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-docker/dcg-latest/docker-compose-generator/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-generator) | | btcpayserver/docker-compose-builder | 1.24.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-compose-builder/v1.24.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-compose-builder) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-compose-builder) | -| btcpayserver/bitcoin | 0.19.0.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | -| btcpayserver/lightning | v0.8.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | +| btcpayserver/bitcoin | 0.20.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | +| btcpayserver/lightning | v0.9.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | shesek/lightning-charge | 0.4.19-standalone | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/ElementsProject/lightning-charge/v0.4.19/arm64v8.Dockerfile) | [Github](https://github.com/ElementsProject/lightning-charge) - [DockerHub](https://hub.docker.com/r/shesek/lightning-charge) | | shesek/spark-wallet | 0.2.9-standalone | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/shesek/spark-wallet/v0.2.9/arm64v8.Dockerfile) | [Github](https://github.com/shesek/spark-wallet) - [DockerHub](https://hub.docker.com/r/shesek/spark-wallet) | -| saubyk/c-lightning-rest | 0.3.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | -| shahanafarooqui/rtl | 0.8.4 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | -| btcpayserver/lnd | v0.10.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | -| btcpayserver/btcpayserver | 1.0.5.4$ | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | -| nicolasdorier/nbxplorer | 2.1.40 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| saubyk/c-lightning-rest | 0.4.3 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) | +| shahanafarooqui/rtl | 0.9.3 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) | +| btcpayserver/lnd | v0.11.0-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | +| btcpayserver/btcpayserver | 1.0.6.4$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | +| nicolasdorier/nbxplorer | 2.1.46 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | btcpayserver/btctransmuter | 0.0.55 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.55/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | -| btcpayserver/eps | 0.2.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | +| btcpayserver/eps | 0.2.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) | +| nicolasdorier/ndlc-cli | 1.0.1 | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile) | [Github](https://github.com/dgarage/ndlc) - [DockerHub](https://hub.docker.com/r/nicolasdorier/ndlc-cli) | | pihole/pihole | v5.0 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_amd64) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_armhf) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_arm64) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | | btcpayserver/tor | 0.4.2.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.2.7/Tor/0.4.2.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | -| postgres | 9.6.5 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | +| postgres | 9.6.20 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | | kamigawabul/btglnd | latest | [✔️](https://raw.githubusercontent.com/vutov/lnd/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/vutov/lnd) - [DockerHub](https://hub.docker.com/r/kamigawabul/btglnd) | | acinq/eclair | release-0.4.1 | [✔️](https://raw.githubusercontent.com/ACINQ/eclair/v0.4.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ACINQ/eclair) - [DockerHub](https://hub.docker.com/r/acinq/eclair) | | chekaz/docker-bitcoinplus | 2.7.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/bitcoinplus/2.7.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-bitcoinplus) | -| dalijolijo/docker-bitcore | 0.15.2 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | -| btcpayserver/dash | 0.14.0.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | -| rockstardev/dogecoin | 1.10.0 | [✔️](https://raw.githubusercontent.com/rockstardev/docker-bitcoin/feature/dogecoin/dogecoin/1.10.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/rockstardev/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/rockstardev/dogecoin) | +| dalijolijo/docker-bitcore | 0.90.9.1 | [✔️](https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/dalijolijo/btcpayserver-docker-bitcore) - [DockerHub](https://hub.docker.com/r/dalijolijo/docker-bitcore) | +| btcpayserver/dash | 0.16.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dash) | +| btcpayserver/dogecoin | 1.14.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.2/Dogecoin/1.14.2/linuxamd64.Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/dogecoin) | | chekaz/docker-feathercoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/feathercoin/0.16.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-feathercoin) | -| groestlcoin/docker-groestlcoin | 2.19.1 | [✔️](https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.19.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/NicolasDorier/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | -| groestlcoin/lightning | v0.8.2 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.8.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | -| groestlcoin/groestlcoin-lightning-charge | version-0.4.19 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.19/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) | -| groestlcoin/groestlcoin-spark | version-0.2.14 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.14/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | +| groestlcoin/docker-groestlcoin | 2.20.1 | [✔️](https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.20.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/NicolasDorier/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/groestlcoin/docker-groestlcoin) | +| groestlcoin/lightning | v0.9.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) | +| groestlcoin/groestlcoin-lightning-charge | version-0.4.22 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) | +| groestlcoin/groestlcoin-spark | version-0.2.16 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) | | groestlcoin/eclair | v0.3.3 | [✔️](https://raw.githubusercontent.com/Groestlcoin/eclair/v0.3.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/eclair) - [DockerHub](https://hub.docker.com/r/groestlcoin/eclair) | | groestlcoin/lnd | v0.10.0-grs | [✔️](https://raw.githubusercontent.com/Groestlcoin/lnd/v0.10.0-grs/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Groestlcoin/lnd) - [DockerHub](https://hub.docker.com/r/groestlcoin/lnd) | | btcpayserver/elements | 0.18.1.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.18.1.7/Elements/0.18.1.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.17.1/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | -| btcpayserver/monero | 0.15.0.1-amd64 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | +| btcpayserver/monero | 0.17.1.8 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | redis | 5.0.2-alpine | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | -| apotdevin/thunderhub | v0.8.13 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | -| btcpayserver/docker-woocommerce | 3.0.6-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | +| apotdevin/thunderhub | base-v0.12.0 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm64v8.Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | +| btcpayserver/docker-woocommerce | 3.0.6-wordpress-5.5.3-php-7.4.12 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-wordpress-5.5.3-php-7.4.12/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | | chekaz/docker-trezarcoin | 0.13.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/trezarcoin/1.2.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-trezarcoin) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 3ea0b0a..dcfe26c 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -430,6 +430,14 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"v{image.Tag}"; dockerInfo.SupportedByUs = true; break; + case "ndlc-cli": + dockerInfo.DockerFilePath = "amd64.Dockerfile"; + dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/dgarage/ndlc"; + dockerInfo.GitRef = $"releases/{image.Tag}"; + dockerInfo.SupportedByUs = true; + break; case "btctransmuter": dockerInfo.DockerFilePath = "Dockerfiles/amd64.Dockerfile"; dockerInfo.DockerFilePathARM32v7 = "Dockerfiles/arm32v7.Dockerfile"; @@ -439,9 +447,9 @@ namespace DockerFileBuildHelper dockerInfo.SupportedByUs = true; break; case "dogecoin": - dockerInfo.DockerFilePath = $"dogecoin/{image.Tag}/Dockerfile"; - dockerInfo.GitLink = "https://github.com/rockstardev/docker-bitcoin"; - dockerInfo.GitRef = "feature/dogecoin"; + dockerInfo.DockerFilePath = $"Dogecoin/{image.Tag}/linuxamd64.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"Dogecoin/{image.Tag}"; break; case "docker-bitcore": dockerInfo.DockerFilePath = "docker-bitcored/Dockerfile"; @@ -550,7 +558,7 @@ namespace DockerFileBuildHelper dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile"; dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile"; dockerInfo.GitLink = "https://github.com/apotdevin/thunderhub"; - dockerInfo.GitRef = $"{image.Tag.Split('-')[0]}"; + dockerInfo.GitRef = $"{image.Tag.Split('-')[1]}"; dockerInfo.SupportedByUs = false; break; case "python-teos": diff --git a/contrib/FastSync/README.md b/contrib/FastSync/README.md index fa6cd24..ffff22c 100644 --- a/contrib/FastSync/README.md +++ b/contrib/FastSync/README.md @@ -113,7 +113,7 @@ If you are a bitcoin developer or public figure, feel free to add your signature keybase pgp sign -i YOU.utxo-sets -c -t -o sigs/YOU.utxo-sets.asc rm YOU.utxo-sets git add sigs/YOU.utxo-sets.asc -git commit -m "Add YOU utxo-set signature" -all +git commit -m "Add YOU utxo-set signature" --all ``` And make a pull request to `btcpayserver-docker` repository. diff --git a/contrib/FastSync/load-utxo-set.sh b/contrib/FastSync/load-utxo-set.sh index b445ac3..8824fa4 100755 --- a/contrib/FastSync/load-utxo-set.sh +++ b/contrib/FastSync/load-utxo-set.sh @@ -31,7 +31,7 @@ fi TAR_FILE="$1" if ! [[ "$UTXO_DOWNLOAD_LINK" ]]; then - [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-609375.tar" + [[ $NBITCOIN_NETWORK == "mainnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-mainnet-651474.tar" [[ $NBITCOIN_NETWORK == "testnet" ]] && UTXO_DOWNLOAD_LINK="http://utxosets.blob.core.windows.net/public/utxo-snapshot-bitcoin-testnet-1445586.tar" fi diff --git a/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc b/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc index 1b6387d..ecbfb73 100644 --- a/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc +++ b/contrib/FastSync/sigs/JUnderwood.utxo-sets.asc @@ -5,14 +5,16 @@ fab994299273080bf7124c8c45c4ada867974ca747900178496a69e450cf713f utxo-snapshot- eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot-bitcoin-testnet-1445586.tar 8e18176138be351707aee95f349dd1debc714cc2cc4f0c76d6a7380988bf0d22 utxo-snapshot-bitcoin-mainnet-565305.tar 58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098 utxo-snapshot-bitcoin-mainnet-585333.tar +52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar +0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar -----BEGIN PGP SIGNATURE----- -iQEzBAEBCgAdFiEEC5br8+cf2C1k8QnTslYYXTqXGQgFAl0ude0ACgkQslYYXTqX -GQi6NggAnrin36xyKOFYJXEE7Ojk82A2Op5/TrN0h4sm9M8zdcKopVkAss6yMqoK -LXX5B1LWruBgjei54JtwKr9bxvtvEZh3bCdYsfE4JcKNZ+um/7mbLfz0mCf6+Hjk -E0RzW7ND2JJqRbSNx8/ZrTKt3QwUD6YyEE0l4KHpBNfJk/Rm4oFeF7hjnUheDTHj -ZTsolccMgFUc1/1YWsHKtG0JFTpfykeBENYWYvkjXWYTmUqdmlhRlaSQW8ryyroA -HnaraS5vFGQQEUkgXszcVoCtQ5PvUVJnNFatbqMoEkmIvuw2hcHtoB95R0wjPVh2 -WzmDxgZQApc45JGhTJbSf/OmH0AKuA== -=41LV +iQEzBAEBCgAdFiEEC5br8+cf2C1k8QnTslYYXTqXGQgFAl9+62YACgkQslYYXTqX +GQh5cgf/Y+0h40ngbndJzs+VuvD2m98fBFpGEDMC1FvZLSEu3MekbEWqTIjHGV9O +vW1p+DL6WgEow+TlYlOorWfAn/hkZqsnuCf4CaPOcazriMbyu2xbXfDiGXo2V64h +eZlGQ8c4VKAPNJOD3NuUNBji5yC2cmYpid7W9Du6o/o+31+uUYJtjSGfVg9q8sAN +t8Iiip4S69xu8TDVJc7j98CvjireHJHWGYh/ku6+NlCH0I7JhqAYMBo5+WwRMPaT +x/t7yPOkCAYY2161u+X0KwcRBdY1HOerG0m+/qODRtvEYcpK/Z0lcfLJ0m5gTrxo +v/JBKugS1UrYVR6hZ5ujLUYSbH3fdg== +=w+jO -----END PGP SIGNATURE----- diff --git a/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc b/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc index 5a06f68..8069b99 100644 --- a/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc +++ b/contrib/FastSync/sigs/NicolasDorier.utxo-sets.asc @@ -6,19 +6,20 @@ eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot- 8e18176138be351707aee95f349dd1debc714cc2cc4f0c76d6a7380988bf0d22 utxo-snapshot-bitcoin-mainnet-565305.tar 58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098 utxo-snapshot-bitcoin-mainnet-585333.tar 52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar +0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar -----BEGIN PGP SIGNATURE----- -wsFcBAEBCAAQBQJeAv9OCRBi/oVkfe3aLgAAueAQAEc5M8yQ6yZ9O3XuYYX0tZNp -qurKOYWb4MC9HZa/FukMGfiKJHOgSi0r4Ix8P4MhQ9OoAZ88snRM3TyE/LFk5Pzp -tGqyYtwTc8GByRFPKto4v4jEJM8PaBcG1o5YYD7dNiEzUt1hUemUc6EcOeY3XTiL -HG8c0p0tQjuM/TwmSL84QxUmeBvdkJdlfcyVh/DD5smvU8+YM17M1rSoaSFJ3B7j -DbkPAbUC+Is6i50HJzujJnzHhFsp78rcxr6NVKRl32JMXgQqizSOjRjrnqhjB8ak -Xyluy+uYU9mGOUDFmVZtmwnx7INkQtGLJyu/o+uRENy3HiFbmIRtx3okGs2tfsli -DxTEIzzYF1VAYSgfTXTT0U+R/8GuK4HbIEo+hAvv5dDmZmgVrSbYIUtne17K76rc -L47Sd10wVBabbrt20IBQEJ2wl5U1HreCaaG92UYDKYCdx6Dqq+EpJ/qU+NYmCGS5 -0HRjec24qGHgHNW2qlaS3YMi/S8mvDvygbM1bN9ivlhpuphsR9Fz/mW7LCnr3MbY -TC/5W6yZZBLbcWRdrn6FzktKqaYi5Qrgd4R2Af7A+q/wLdd4qG5nD4H7amsOSkFb -YCGV/lQpFpCtty5Md0P7FjIH48S9eqBZVXnn8yBOu/ZXTK17oM4bvzjgvv+jAyJ/ -r6WLaI7HilrHzN6/LUyK -=AOXj +wsFcBAEBCAAQBQJffrH/CRBmGHY+8JGG/gAA5hIQAHIPmHgFrmK6EVmUxDzt1Z8c +9Kxa6cGEFKpjvRemRMfnLqn7JI2W+2i3BcFMYaft1VrtFm0q7HygeG5waLw08lW+ +sVrizEz/Ovlq2yQ+TjwZW+dCPsYi/7qMhevnGO8YUJUyIuQCrlDsYwwZmTSQe7tp +d5eJ5k9Q9aNpEegZSq2iAcx2ejSXUmSSpoJ56DBPSrUMt07qfj6Pzo/YeDm2pY5e +CNwsbqKsAAtwOZwJq5YZHkFOXKZTo6yFPs9LlZ5jNGpnI+7JwTdP7T3Kf3bxmY0m +exYN/6+0Ga8Ndf+w3lSv95XFMKfPoJCU8nnHgzQUObQ2t/2zZoc6hXxloS+BX4Yi +kIWYeU4Abrby+2RnJPYPnJaranrthrhT6aIT1/BWUkD/8uaCabW5t8he4SGlflF6 +zzWb6SYzF/BSxjzi+pngWTYzRZeALj+Ib1ku5j60Rc8rrGw2yl8qrh3ROc+Z7EEh +4mfwI0NYYlTrdmiFqSXc3VQWr20WlyyBQ90H9sS7t8eI7jX1RXe4P7TP/DTS0F9g +jyy0empdVFGxL3q2Mc1Dz35BfQlzEoc4xgMe9NVUAFJv94aoeGuxpJLcnYMuk0cU +pENZYJ3qCHkuTgCQfLO3MM0GNUPVzd27biNU0u9HM/vNBitWdlW2rP/4LFYAYnYW +jJY95tNwjhIQr+mPoiWl +=/na8 -----END PGP SIGNATURE----- diff --git a/contrib/FastSync/utxo-sets b/contrib/FastSync/utxo-sets index 15a9c7e..d0bee48 100644 --- a/contrib/FastSync/utxo-sets +++ b/contrib/FastSync/utxo-sets @@ -2,4 +2,5 @@ fab994299273080bf7124c8c45c4ada867974ca747900178496a69e450cf713f utxo-snapshot- eabaaa717bb8eeaf603e383dd8642d9d34df8e767fccbd208b0c936b79c82742 utxo-snapshot-bitcoin-testnet-1445586.tar 8e18176138be351707aee95f349dd1debc714cc2cc4f0c76d6a7380988bf0d22 utxo-snapshot-bitcoin-mainnet-565305.tar 58f65fc3e2abc367602c07ab0e7ae4a042e6acf2bc026623c7322d1886f52098 utxo-snapshot-bitcoin-mainnet-585333.tar -52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar \ No newline at end of file +52f0fc62dd28d016f49a75c22a6fa0827efc730f882bfa8cbc5ef96736d12100 utxo-snapshot-bitcoin-mainnet-609375.tar +0afe8ca07e0ad2b538f43fc3ada89500b3e8594e8c16e0813c30d25fcff0d5a3 utxo-snapshot-bitcoin-mainnet-651474.tar \ No newline at end of file diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh old mode 100755 new mode 100644 index 04b126d..88e5270 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -62,18 +62,18 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.8.2/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.1/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.8.2" +echo "Building btcpayserver/lightning:v0.9.1" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.8.2 +git checkout basedon-v0.9.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.8.2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.9.1" . cd - && cd .. @@ -110,34 +110,34 @@ cd - && cd .. # Build c-lightning-rest -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/amd64.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm32v7.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm64v8.Dockerfile +# https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.4.3/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building saubyk/c-lightning-rest:0.3.0" +echo "Building saubyk/c-lightning-rest:0.4.3" git clone https://github.com/Ride-The-Lightning/c-lightning-REST c-lightning-rest cd c-lightning-rest -git checkout v0.3.0 +git checkout v0.4.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.3.0" . +docker build -f "$DOCKERFILE" -t "saubyk/c-lightning-rest:0.4.3" . cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.4/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.8.4" +echo "Building shahanafarooqui/rtl:0.9.3" git clone https://github.com/ShahanaFarooqui/RTL rtl cd rtl -git checkout v0.8.4 +git checkout v0.9.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.8.4" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.9.3" . cd - && cd .. @@ -170,50 +170,50 @@ cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.10.2-beta" +echo "Building btcpayserver/lnd:v0.11.0-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.10.2-beta +git checkout basedon-v0.11.0-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.10.2-beta" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.11.0-beta" . cd - && cd .. # Build rtl -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm32v7 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.arm32v7" -# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm64v8 +# https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.9.3/Dockerfile.arm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.arm64v8" -echo "Building shahanafarooqui/rtl:0.8.2" +echo "Building shahanafarooqui/rtl:0.9.3" git clone https://github.com/ShahanaFarooqui/RTL rtl cd rtl -git checkout v0.8.2 +git checkout v0.9.3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.8.2" . +docker build -f "$DOCKERFILE" -t "shahanafarooqui/rtl:0.9.3" . cd - && cd .. # Build bitcoin -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxamd64.Dockerfile -DOCKERFILE="Bitcoin/0.19.0.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/0.19.0.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.19.0.1/Bitcoin/0.19.0.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/0.19.0.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/bitcoin:0.19.0.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxamd64.Dockerfile +DOCKERFILE="Bitcoin/0.20.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Bitcoin/0.20.1/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/0.20.1/Bitcoin/0.20.1/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Bitcoin/0.20.1/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/bitcoin:0.20.1" git clone https://github.com/btcpayserver/dockerfile-deps bitcoin cd bitcoin -git checkout Bitcoin/0.19.0.1 +git checkout Bitcoin/0.20.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:0.19.0.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/bitcoin:0.20.1" . cd - && cd .. @@ -232,56 +232,56 @@ cd - && cd .. # Build docker-bitcore # https://raw.githubusercontent.com/dalijolijo/btcpayserver-docker-bitcore/master/docker-bitcored/Dockerfile DOCKERFILE="docker-bitcored/Dockerfile" -echo "Building dalijolijo/docker-bitcore:0.15.2" +echo "Building dalijolijo/docker-bitcore:0.90.9.1" git clone https://github.com/dalijolijo/btcpayserver-docker-bitcore docker-bitcore cd docker-bitcore git checkout master cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "dalijolijo/docker-bitcore:0.15.2" . +docker build -f "$DOCKERFILE" -t "dalijolijo/docker-bitcore:0.90.9.1" . cd - && cd .. # Build btcpayserver -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/amd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/amd64.Dockerfile DOCKERFILE="amd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.6.4/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building btcpayserver/btcpayserver:1.0.5.4$" +echo "Building btcpayserver/btcpayserver:1.0.6.4$?" git clone https://github.com/btcpayserver/btcpayserver btcpayserver cd btcpayserver -git checkout v1.0.5.4 +git checkout v1.0.6.4 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.5.4$" . +docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.6.4$?" . cd - && cd .. # Build dash -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxamd64.Dockerfile -DOCKERFILE="Dash/0.14.0.1/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dash/0.14.0.1/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.14.0.1/Dash/0.14.0.1/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dash/0.14.0.1/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/dash:0.14.0.1" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxamd64.Dockerfile +DOCKERFILE="Dash/0.16.1.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dash/0.16.1.1/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dash/0.16.1.1/Dash/0.16.1.1/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dash/0.16.1.1/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/dash:0.16.1.1" git clone https://github.com/btcpayserver/dockerfile-deps dash cd dash -git checkout Dash/0.14.0.1 +git checkout Dash/0.16.1.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/dash:0.14.0.1" . +docker build -f "$DOCKERFILE" -t "btcpayserver/dash:0.16.1.1" . cd - && cd .. # Build dogecoin -# https://raw.githubusercontent.com/rockstardev/docker-bitcoin/feature/dogecoin/dogecoin/1.10.0/Dockerfile -DOCKERFILE="dogecoin/1.10.0/Dockerfile" -echo "Building rockstardev/dogecoin:1.10.0" -git clone https://github.com/rockstardev/docker-bitcoin dogecoin +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Dogecoin/1.14.2/Dogecoin/1.14.2/linuxamd64.Dockerfile +DOCKERFILE="Dogecoin/1.14.2/linuxamd64.Dockerfile" +echo "Building btcpayserver/dogecoin:1.14.2" +git clone https://github.com/btcpayserver/dockerfile-deps dogecoin cd dogecoin -git checkout feature/dogecoin +git checkout Dogecoin/1.14.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "rockstardev/dogecoin:1.10.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/dogecoin:1.14.2" . cd - && cd .. @@ -298,38 +298,38 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.8.2/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/lightning/v0.9.0/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/lightning:v0.8.2" +echo "Building groestlcoin/lightning:v0.9.0" git clone https://github.com/Groestlcoin/lightning lightning cd lightning -git checkout v0.8.2 +git checkout v0.9.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.8.2" . +docker build -f "$DOCKERFILE" -t "groestlcoin/lightning:v0.9.0" . cd - && cd .. # Build groestlcoin-lightning-charge -# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.19/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.22/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/groestlcoin-lightning-charge:version-0.4.19" +echo "Building groestlcoin/groestlcoin-lightning-charge:version-0.4.22" git clone https://github.com/Groestlcoin/groestlcoin-lightning-charge groestlcoin-lightning-charge cd groestlcoin-lightning-charge -git checkout v0.4.19 +git checkout v0.4.22 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-lightning-charge:version-0.4.19" . +docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-lightning-charge:version-0.4.22" . cd - && cd .. # Build groestlcoin-spark -# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.14/Dockerfile +# https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.16/Dockerfile DOCKERFILE="Dockerfile" -echo "Building groestlcoin/groestlcoin-spark:version-0.2.14" +echo "Building groestlcoin/groestlcoin-spark:version-0.2.16" git clone https://github.com/Groestlcoin/groestlcoin-spark groestlcoin-spark cd groestlcoin-spark -git checkout v0.2.14 +git checkout v0.2.16 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.14" . +docker build -f "$DOCKERFILE" -t "groestlcoin/groestlcoin-spark:version-0.2.16" . cd - && cd .. @@ -358,14 +358,14 @@ cd - && cd .. # Build docker-groestlcoin -# https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.19.1/Dockerfile -DOCKERFILE="groestlcoin/2.19.1/Dockerfile" -echo "Building groestlcoin/docker-groestlcoin:2.19.1" +# https://raw.githubusercontent.com/NicolasDorier/docker-bitcoin/master/groestlcoin/2.20.1/Dockerfile +DOCKERFILE="groestlcoin/2.20.1/Dockerfile" +echo "Building groestlcoin/docker-groestlcoin:2.20.1" git clone https://github.com/NicolasDorier/docker-bitcoin docker-groestlcoin cd docker-groestlcoin git checkout master cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.19.1" . +docker build -f "$DOCKERFILE" -t "groestlcoin/docker-groestlcoin:2.20.1" . cd - && cd .. @@ -386,34 +386,34 @@ cd - && cd .. # Build lightning -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/contrib/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/contrib/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="contrib/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.3/contrib/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.9.0-1/contrib/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="contrib/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lightning:v0.7.3" +echo "Building btcpayserver/lightning:v0.9.0-1" git clone https://github.com/btcpayserver/lightning lightning cd lightning -git checkout basedon-v0.7.3 +git checkout basedon-v0.9.0-1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.7.3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.9.0-1" . cd - && cd .. # Build lnd -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxamd64.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxamd64.Dockerfile DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm32v7.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm64v8.Dockerfile +# https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.11.0-beta/linuxarm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/lnd:v0.10.2-beta" +echo "Building btcpayserver/lnd:v0.11.0-beta" git clone https://github.com/btcpayserver/lnd lnd cd lnd -git checkout basedon-v0.10.2-beta +git checkout basedon-v0.11.0-beta cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.10.2-beta" . +docker build -f "$DOCKERFILE" -t "btcpayserver/lnd:v0.11.0-beta" . cd - && cd .. @@ -446,40 +446,40 @@ cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.15.0.1-amd64" +echo "Building btcpayserver/monero:0.17.1.8" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.15.0.1-amd64" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.8" . cd - && cd .. # Build monero # https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.15.0.1-amd64" +echo "Building btcpayserver/monero:0.17.1.8" git clone https://github.com/Kukks/monero-docker monero cd monero git checkout x86_64 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.15.0.1-amd64" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.17.1.8" . cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.46/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.1.40" +echo "Building nicolasdorier/nbxplorer:2.1.46" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.1.40 +git checkout v2.1.46 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.1.40" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.1.46" . cd - && cd .. @@ -588,18 +588,18 @@ cd - && cd .. # Build eps -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile -DOCKERFILE="EPS/0.2.0/linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.0/linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.0/linuxarm64v8.Dockerfile" -echo "Building btcpayserver/eps:0.2.0" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxamd64.Dockerfile +DOCKERFILE="EPS/0.2.1.1/linuxamd64.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.1.1/linuxarm32v7.Dockerfile" +# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.1.1/EPS/0.2.1.1/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.1.1/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/eps:0.2.1.1" git clone https://github.com/btcpayserver/dockerfile-deps eps cd eps -git checkout EPS/0.2.0 +git checkout EPS/0.2.1.1 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.0" . +docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.1.1" . cd - && cd .. @@ -639,6 +639,22 @@ docker build -f "$DOCKERFILE" -t "jvandrew/isso:atron.22" . cd - && cd .. +# Build ndlc-cli +# https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/amd64.Dockerfile +DOCKERFILE="amd64.Dockerfile" +# https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm32v7.Dockerfile +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" +# https://raw.githubusercontent.com/dgarage/ndlc/releases/1.0.1/arm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" +echo "Building nicolasdorier/ndlc-cli:1.0.1" +git clone https://github.com/dgarage/ndlc ndlc-cli +cd ndlc-cli +git checkout releases/1.0.1 +cd "$(dirname $DOCKERFILE)" +docker build -f "$DOCKERFILE" -t "nicolasdorier/ndlc-cli:1.0.1" . +cd - && cd .. + + # Build pihole # https://raw.githubusercontent.com/pi-hole/docker-pi-hole/v5.0/Dockerfile_amd64 DOCKERFILE="Dockerfile_amd64" @@ -672,18 +688,18 @@ cd - && cd .. # Build thunderhub -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/Dockerfile DOCKERFILE="Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/arm32v7.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm32v7.Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile" -# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.8.13/arm64v8.Dockerfile +# https://raw.githubusercontent.com/apotdevin/thunderhub/v0.12.0/arm64v8.Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile" -echo "Building apotdevin/thunderhub:v0.8.13" +echo "Building apotdevin/thunderhub:base-v0.12.0" git clone https://github.com/apotdevin/thunderhub thunderhub cd thunderhub -git checkout v0.8.13 +git checkout v0.12.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:v0.8.13" . +docker build -f "$DOCKERFILE" -t "apotdevin/thunderhub:base-v0.12.0" . cd - && cd .. @@ -752,14 +768,14 @@ cd - && cd .. # Build docker-woocommerce -# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-wordpress-5.5.3-php-7.4.12/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/docker-woocommerce:3.0.6-3" +echo "Building btcpayserver/docker-woocommerce:3.0.6-wordpress-5.5.3-php-7.4.12" git clone https://github.com/btcpayserver/docker-woocommerce docker-woocommerce cd docker-woocommerce -git checkout v3.0.6-3 +git checkout v3.0.6-wordpress-5.5.3-php-7.4.12 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.6-3" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.6-wordpress-5.5.3-php-7.4.12" . cd - && cd .. @@ -782,12 +798,12 @@ DOCKERFILE="9.6/Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile" # https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile" -echo "Building postgres:9.6.5" +echo "Building postgres:9.6.20" git clone https://github.com/docker-library/postgres postgres cd postgres git checkout b7cb3c6eacea93be2259381033be3cc435649369 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "postgres:9.6.5" . +docker build -f "$DOCKERFILE" -t "postgres:9.6.20" . cd - && cd .. diff --git a/docker-compose-generator/crypto-definitions.json b/docker-compose-generator/crypto-definitions.json index 5b92a0f..28a8597 100644 --- a/docker-compose-generator/crypto-definitions.json +++ b/docker-compose-generator/crypto-definitions.json @@ -82,5 +82,12 @@ "CLightningFragment": null, "LNDFragment": null, "EclairFragment": null + }, + { + "Crypto": "eth", + "CryptoFragment": "ethereum", + "CLightningFragment": null, + "LNDFragment": null, + "EclairFragment": null } ] diff --git a/docker-compose-generator/docker-fragments/bgold-lnd.yml b/docker-compose-generator/docker-fragments/bgold-lnd.yml index ef9b8e9..4ca8232 100644 --- a/docker-compose-generator/docker-fragments/bgold-lnd.yml +++ b/docker-compose-generator/docker-fragments/bgold-lnd.yml @@ -36,7 +36,7 @@ services: - "lnd_bitcoingold_datadir:/etc/lnd_bitcoingold" links: - lnd_bitcoingold - + nginx: links: - "lnd_bitcoingold" @@ -52,4 +52,4 @@ volumes: lnd_bitcoingold_datadir: required: - - "opt-add-zmq" \ No newline at end of file + - "opt-add-zmq" diff --git a/docker-compose-generator/docker-fragments/bgold.yml b/docker-compose-generator/docker-fragments/bgold.yml index a7fa24c..ddbacf8 100644 --- a/docker-compose-generator/docker-fragments/bgold.yml +++ b/docker-compose-generator/docker-fragments/bgold.yml @@ -2,30 +2,30 @@ version: "3" services: bgoldd: - restart: unless-stopped - container_name: btcpayserver_bgoldd - image: kamigawabul/docker-bitcoingold:0.15.2 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "bgold_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_bgoldd + image: kamigawabul/docker-bitcoingold:0.15.2 + environment: + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "bgold_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "btg" - NBXPLORER_BTGRPCURL: http://bgoldd:43782/ - NBXPLORER_BTGNODEENDPOINT: bgoldd:39388 - volumes: - - "bgold_datadir:/root/.bitcoingold" + environment: + NBXPLORER_CHAINS: "btg" + NBXPLORER_BTGRPCURL: http://bgoldd:43782/ + NBXPLORER_BTGNODEENDPOINT: bgoldd:39388 + volumes: + - "bgold_datadir:/root/.bitcoingold" btcpayserver: - environment: - BTCPAY_CHAINS: "btg" - BTCPAY_BTGEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "btg" + BTCPAY_BTGEXPLORERURL: http://nbxplorer:32838/ volumes: bgold_datadir: diff --git a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml index 641af4e..094a3dd 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: btcpayserver/lightning:v0.8.2 + image: btcpayserver/lightning:v0.9.1 container_name: btcpayserver_clightning_bitcoin restart: unless-stopped environment: @@ -50,26 +50,28 @@ services: links: - clightning_bitcoin expose: - - "9737" + - "9737" clightning_bitcoin_rest: - image: saubyk/c-lightning-rest:0.3.0 + image: saubyk/c-lightning-rest:0.4.3 restart: unless-stopped stop_signal: SIGKILL environment: PROTOCOL: "http" NODE: clightning_bitcoin:9835 + LIGHTNINGD_READY_FILE: /root/.nbxplorer/btc_fully_synched links: - clightning_bitcoin volumes: - "clightning_bitcoin_datadir:/root/.lightning" - "bitcoin_datadir:/etc/bitcoin" - "clightning_bitcoin_rest_datadir:/usr/src/app" + - "nbxplorer_datadir:/root/.nbxplorer" expose: - "3001" bitcoin_rtl: - image: shahanafarooqui/rtl:0.8.4 + image: shahanafarooqui/rtl:0.9.3 restart: unless-stopped environment: LN_IMPLEMENTATION: CLT @@ -87,8 +89,8 @@ services: - "clightning_bitcoin_rtl_datadir:/data" - "clightning_bitcoin_rest_datadir:/etc/clightning_bitcoin_rest" expose: - - "3000" - + - "3000" + btcpayserver: environment: BTCPAY_BTCLIGHTNING: "type=clightning;server=unix://etc/clightning_bitcoin/lightning-rpc" diff --git a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml index 24f4484..0c9709a 100644 --- a/docker-compose-generator/docker-fragments/bitcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/bitcoin-eclair.yml @@ -32,14 +32,14 @@ services: -Declair.bitcoind.zmqblock=tcp://bitcoind:28332 -Declair.bitcoind.zmqtx=tcp://bitcoind:28333 expose: - - "9735" # server port - - "8080" # api port + - "9735" # server port + - "8080" # api port volumes: - "bitcoin_datadir:/etc/bitcoin" - "eclair_bitcoin_datadir:/data" links: - bitcoind - + bitcoin_rtl: image: shahanafarooqui/rtl:0.8.2 restart: unless-stopped @@ -71,6 +71,7 @@ services: - eclair_bitcoin volumes: eclair_bitcoin_datadir: + eclair_bitcoin_rtl_datadir: incompatible: - pruning diff --git a/docker-compose-generator/docker-fragments/bitcoin-lnd.yml b/docker-compose-generator/docker-fragments/bitcoin-lnd.yml index 2bb9c9c..3ad0838 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:v0.10.2-beta + image: btcpayserver/lnd:v0.11.0-beta container_name: btcpayserver_lnd_bitcoin restart: unless-stopped environment: @@ -27,6 +27,7 @@ services: readonlymacaroonpath=/data/readonly.macaroon notls=1 tlsextradomain=lnd_bitcoin + protocol.wumbo-channels=1 ports: - "9735:9735" expose: @@ -40,7 +41,7 @@ services: - bitcoind bitcoin_rtl: - image: shahanafarooqui/rtl:0.8.4 + image: shahanafarooqui/rtl:0.9.3 restart: unless-stopped environment: LND_SERVER_URL: http://lnd_bitcoin:8080/v1 @@ -81,7 +82,7 @@ services: # We need to use rpcauth because we also need cookieauth. rpcpassword disabled cookie file auth. # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped. rpcauth=lnd:d031f7567c5b02ba95524170e51c77f4$$827ce5412f653d6613c2f480e521eb437c866b999bdeb2ee4f9c41d3b00dff1c - + nginx: links: - "lnd_bitcoin" @@ -98,4 +99,4 @@ volumes: lnd_bitcoin_rtl_datadir: required: - - "opt-add-zmq" \ No newline at end of file + - "opt-add-zmq" diff --git a/docker-compose-generator/docker-fragments/bitcoin.yml b/docker-compose-generator/docker-fragments/bitcoin.yml index 47c8f4a..456d370 100644 --- a/docker-compose-generator/docker-fragments/bitcoin.yml +++ b/docker-compose-generator/docker-fragments/bitcoin.yml @@ -2,34 +2,35 @@ version: "3" services: bitcoind: - restart: unless-stopped - container_name: btcpayserver_bitcoind - image: btcpayserver/bitcoin:0.19.0.1 - environment: - BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} - BITCOIN_WALLETDIR: "/walletdata" - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - rpcbind=0.0.0.0:43782 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "bitcoin_datadir:/data" - - "bitcoin_wallet_datadir:/walletdata" + restart: unless-stopped + container_name: btcpayserver_bitcoind + image: btcpayserver/bitcoin:0.20.1 + environment: + BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest} + BITCOIN_WALLETDIR: "/walletdata" + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + rpcbind=0.0.0.0:43782 + port=39388 + whitelist=0.0.0.0/0 + maxmempool=500 + expose: + - "43782" + - "39388" + volumes: + - "bitcoin_datadir:/data" + - "bitcoin_wallet_datadir:/walletdata" nbxplorer: - environment: - NBXPLORER_CHAINS: "btc" - NBXPLORER_BTCRPCURL: http://bitcoind:43782/ - NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 - volumes: - - "bitcoin_datadir:/root/.bitcoin" + environment: + NBXPLORER_CHAINS: "btc" + NBXPLORER_BTCRPCURL: http://bitcoind:43782/ + NBXPLORER_BTCNODEENDPOINT: bitcoind:39388 + volumes: + - "bitcoin_datadir:/root/.bitcoin" btcpayserver: - environment: - BTCPAY_CHAINS: "btc" - BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "btc" + BTCPAY_BTCEXPLORERURL: http://nbxplorer:32838/ volumes: bitcoin_datadir: - bitcoin_wallet_datadir: \ No newline at end of file + bitcoin_wallet_datadir: diff --git a/docker-compose-generator/docker-fragments/bitcoinplus.yml b/docker-compose-generator/docker-fragments/bitcoinplus.yml index 73c7071..7c81fbe 100644 --- a/docker-compose-generator/docker-fragments/bitcoinplus.yml +++ b/docker-compose-generator/docker-fragments/bitcoinplus.yml @@ -2,34 +2,34 @@ version: "3" services: bitcoinplusd: - restart: unless-stopped - container_name: btcpayserver_bitcoinplusd - image: chekaz/docker-bitcoinplus:2.7.0 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "bitcoinplus_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_bitcoinplusd + image: chekaz/docker-bitcoinplus:2.7.0 + environment: + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "bitcoinplus_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "xbc" - NBXPLORER_XBCRPCURL: http://bitcoinplusd:43782/ - NBXPLORER_XBCNODEENDPOINT: bitcoinplusd:39388 - NBXPLORER_XBCRPCUSER: "NBXPLORER_XBCRPCUSER" - NBXPLORER_XBCRPCPASSWORD: "NBXPLORER_XBCRPCPASS" - links: - - bitcoinplusd - volumes: - - "bitcoinplus_datadir:/root/.bitcoinplus" + environment: + NBXPLORER_CHAINS: "xbc" + NBXPLORER_XBCRPCURL: http://bitcoinplusd:43782/ + NBXPLORER_XBCNODEENDPOINT: bitcoinplusd:39388 + NBXPLORER_XBCRPCUSER: "NBXPLORER_XBCRPCUSER" + NBXPLORER_XBCRPCPASSWORD: "NBXPLORER_XBCRPCPASS" + links: + - bitcoinplusd + volumes: + - "bitcoinplus_datadir:/root/.bitcoinplus" btcpayserver: - environment: - BTCPAY_CHAINS: "xbc" - BTCPAY_TZCEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "xbc" + BTCPAY_TZCEXPLORERURL: http://nbxplorer:32838/ volumes: bitcoinplus_datadir: diff --git a/docker-compose-generator/docker-fragments/bitcore.yml b/docker-compose-generator/docker-fragments/bitcore.yml index db6d860..6fa4363 100644 --- a/docker-compose-generator/docker-fragments/bitcore.yml +++ b/docker-compose-generator/docker-fragments/bitcore.yml @@ -4,7 +4,7 @@ services: bitcored: restart: unless-stopped container_name: btcpayserver_bitcored - image: dalijolijo/docker-bitcore:0.15.2 + image: dalijolijo/docker-bitcore:0.90.9.1 environment: BITCOIN_EXTRA_ARGS: | rpcport=43782 @@ -17,18 +17,18 @@ services: volumes: - "bitcore_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "btx" - NBXPLORER_BTXRPCURL: http://bitcored:43782/ - NBXPLORER_BTXNODEENDPOINT: bitcored:39388 - links: - - bitcored - volumes: - - "bitcore_datadir:/root/.bitcore" + environment: + NBXPLORER_CHAINS: "btx" + NBXPLORER_BTXRPCURL: http://bitcored:43782/ + NBXPLORER_BTXNODEENDPOINT: bitcored:39388 + links: + - bitcored + volumes: + - "bitcore_datadir:/root/.bitcore" btcpayserver: - environment: - BTCPAY_BTXEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "btx" + environment: + BTCPAY_BTXEXPLORERURL: http://nbxplorer:32838/ + BTCPAY_CHAINS: "btx" volumes: - bitcore_datadir: + bitcore_datadir: diff --git a/docker-compose-generator/docker-fragments/btcpayserver-nginx.yml b/docker-compose-generator/docker-fragments/btcpayserver-nginx.yml index e502ff7..c7ccce9 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver-nginx.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver-nginx.yml @@ -9,8 +9,8 @@ services: VIRTUAL_PORT: 49392 VIRTUAL_HOST: ${BTCPAY_HOST},${BTCPAY_ADDITIONAL_HOSTS} VIRTUAL_HOST_NAME: "btcpay" - SSL_POLICY: Mozilla-Modern + SSL_POLICY: Mozilla-Modern # Let's encrypt settings LETSENCRYPT_HOST: ${BTCPAY_HOST},${BTCPAY_ADDITIONAL_HOSTS} - LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} \ No newline at end of file + LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL:-} diff --git a/docker-compose-generator/docker-fragments/btcpayserver-noreverseproxy.yml b/docker-compose-generator/docker-fragments/btcpayserver-noreverseproxy.yml index 92a8e87..22577fb 100644 --- a/docker-compose-generator/docker-fragments/btcpayserver-noreverseproxy.yml +++ b/docker-compose-generator/docker-fragments/btcpayserver-noreverseproxy.yml @@ -2,8 +2,8 @@ version: "3" services: btcpayserver: - ports: + ports: - "80:49392" exclusive: - - proxy \ No newline at end of file + - proxy diff --git a/docker-compose-generator/docker-fragments/btcpayserver.yml b/docker-compose-generator/docker-fragments/btcpayserver.yml index 2aefc6b..2929945 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: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.5.4$?} + image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.6.4$?} expose: - "49392" environment: @@ -18,12 +18,14 @@ services: BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} BTCPAY_SSHAUTHORIZEDKEYS: ${BTCPAY_SSHAUTHORIZEDKEYS} BTCPAY_DEBUGLOG: btcpay.log + BTCPAY_UPDATEURL: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest + BTCPAY_DOCKERDEPLOYMENT: "true" links: - postgres volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "$?:${BTCPAY_SSHAUTHORIZEDKEYS}" + - "btcpay_datadir:/datadir" + - "nbxplorer_datadir:/root/.nbxplorer" + - "$?:${BTCPAY_SSHAUTHORIZEDKEYS}" volumes: btcpay_datadir: @@ -33,4 +35,4 @@ required: - "nbxplorer" - "btcpayserver" recommended: - - "opt-add-tor" \ No newline at end of file + - "opt-add-tor" diff --git a/docker-compose-generator/docker-fragments/dash.yml b/docker-compose-generator/docker-fragments/dash.yml index 0859f3d..429e7aa 100644 --- a/docker-compose-generator/docker-fragments/dash.yml +++ b/docker-compose-generator/docker-fragments/dash.yml @@ -2,30 +2,30 @@ version: "3" services: dashd: - restart: unless-stopped - container_name: btcpayserver_dashd - image: btcpayserver/dash:0.14.0.1 - environment: - BITCOIN_EXTRA_ARGS: | - ${NBITCOIN_NETWORK:-regtest}=1 - port=9999 - rpcport=9998 - whitelist=0.0.0.0/0 - expose: - - "9998" - - "9999" - volumes: - - "dash_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_dashd + image: btcpayserver/dash:0.16.1.1 + environment: + BITCOIN_EXTRA_ARGS: | + ${NBITCOIN_NETWORK:-regtest}=1 + port=9999 + rpcport=9998 + whitelist=0.0.0.0/0 + expose: + - "9998" + - "9999" + volumes: + - "dash_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "dash" - NBXPLORER_DASHRPCURL: http://dashd:9998/ - NBXPLORER_DASHNODEENDPOINT: dashd:9999 - volumes: - - "dash_datadir:/root/.dashcore" + environment: + NBXPLORER_CHAINS: "dash" + NBXPLORER_DASHRPCURL: http://dashd:9998/ + NBXPLORER_DASHNODEENDPOINT: dashd:9999 + volumes: + - "dash_datadir:/root/.dashcore" btcpayserver: - environment: - BTCPAY_CHAINS: "dash" - BTCPAY_DASHEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "dash" + BTCPAY_DASHEXPLORERURL: http://nbxplorer:32838/ volumes: dash_datadir: diff --git a/docker-compose-generator/docker-fragments/dogecoin.yml b/docker-compose-generator/docker-fragments/dogecoin.yml index a421a4d..e593a72 100644 --- a/docker-compose-generator/docker-fragments/dogecoin.yml +++ b/docker-compose-generator/docker-fragments/dogecoin.yml @@ -2,40 +2,40 @@ version: "3" services: dogecoind: - restart: unless-stopped - container_name: btcpayserver_dogecoind - image: rockstardev/dogecoin:1.10.0 - environment: - DOGECOIN_EXTRA_ARGS: | - rpcuser=ceiwHEbqWI83 - rpcpassword=DwubwWsoo3 - ${NBITCOIN_NETWORK:-regtest}=1 - server=1 - rpcport=22555 - port=22556 - whitelist=0.0.0.0/0 - # Reducing memory usage of dogecoind. Don't try running this container without at least 2 GB of memory - # https://www.reddit.com/r/dogecoin/comments/5wynqe/reducing_memory_usage_of_dogecoind/ - dbcache=50 - ports: - - "22555:22555" - expose: - - "22555" # RPC - - "22556" # P2P - volumes: - - "dogecoin_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_dogecoind + image: btcpayserver/dogecoin:1.14.2 + environment: + DOGECOIN_EXTRA_ARGS: | + rpcuser=ceiwHEbqWI83 + rpcpassword=DwubwWsoo3 + ${NBITCOIN_NETWORK:-regtest}=1 + server=1 + rpcport=22555 + port=22556 + whitelist=0.0.0.0/0 + # Reducing memory usage of dogecoind. Don't try running this container without at least 2 GB of memory + # https://www.reddit.com/r/dogecoin/comments/5wynqe/reducing_memory_usage_of_dogecoind/ + dbcache=50 + ports: + - "22555:22555" + expose: + - "22555" # RPC + - "22556" # P2P + volumes: + - "dogecoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "doge" - NBXPLORER_DOGERPCURL: http://dogecoind:22555/ - NBXPLORER_DOGENODEENDPOINT: dogecoind:22556 - NBXPLORER_DOGERPCUSER: ceiwHEbqWI83 - NBXPLORER_DOGERPCPASSWORD: DwubwWsoo3 - volumes: - - "dogecoin_datadir:/root/.dogecoin" + environment: + NBXPLORER_CHAINS: "doge" + NBXPLORER_DOGERPCURL: http://dogecoind:22555/ + NBXPLORER_DOGENODEENDPOINT: dogecoind:22556 + NBXPLORER_DOGERPCUSER: ceiwHEbqWI83 + NBXPLORER_DOGERPCPASSWORD: DwubwWsoo3 + volumes: + - "dogecoin_datadir:/root/.dogecoin" btcpayserver: - environment: - BTCPAY_CHAINS: "doge" - BTCPAY_DOGEEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "doge" + BTCPAY_DOGEEXPLORERURL: http://nbxplorer:32838/ volumes: dogecoin_datadir: diff --git a/docker-compose-generator/docker-fragments/ethereum.yml b/docker-compose-generator/docker-fragments/ethereum.yml new file mode 100644 index 0000000..8386fd8 --- /dev/null +++ b/docker-compose-generator/docker-fragments/ethereum.yml @@ -0,0 +1,6 @@ +version: "3" + +services: + btcpayserver: + environment: + BTCPAY_CHAINS: "eth" diff --git a/docker-compose-generator/docker-fragments/feathercoin.yml b/docker-compose-generator/docker-fragments/feathercoin.yml index c58ca64..8f7b4e1 100644 --- a/docker-compose-generator/docker-fragments/feathercoin.yml +++ b/docker-compose-generator/docker-fragments/feathercoin.yml @@ -2,30 +2,30 @@ version: "3" services: feathercoind: - restart: unless-stopped - container_name: btcpayserver_feathercoind - image: chekaz/docker-feathercoin:0.16.3 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "feathercoin_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_feathercoind + image: chekaz/docker-feathercoin:0.16.3 + environment: + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "feathercoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "ftc" - NBXPLORER_FTCRPCURL: http://feathercoind:43782/ - NBXPLORER_FTCNODEENDPOINT: feathercoind:39388 - volumes: - - "feathercoin_datadir:/root/.feathercoin" + environment: + NBXPLORER_CHAINS: "ftc" + NBXPLORER_FTCRPCURL: http://feathercoind:43782/ + NBXPLORER_FTCNODEENDPOINT: feathercoind:39388 + volumes: + - "feathercoin_datadir:/root/.feathercoin" btcpayserver: - environment: - BTCPAY_CHAINS: "ftc" - BTCPAY_FTCEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "ftc" + BTCPAY_FTCEXPLORERURL: http://nbxplorer:32838/ volumes: feathercoin_datadir: diff --git a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml index 1d406a3..b14d6af 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-clightning.yml @@ -2,7 +2,7 @@ version: "3" services: clightning_groestlcoin: - image: groestlcoin/lightning:v0.8.2 + image: groestlcoin/lightning:v0.9.0 stop_signal: SIGKILL container_name: btcpayserver_clightning_groestlcoin restart: unless-stopped @@ -29,7 +29,7 @@ services: - nbxplorer - groestlcoind clightning_groestlcoin_charge: - image: groestlcoin/groestlcoin-lightning-charge:version-0.4.19 + image: groestlcoin/groestlcoin-lightning-charge:version-0.4.22 restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest} @@ -54,19 +54,19 @@ services: links: - clightning_groestlcoin clightning_groestlcoin_spark: - image: groestlcoin/groestlcoin-spark:version-0.2.14 + image: groestlcoin/groestlcoin-spark:version-0.2.16 stop_signal: SIGKILL restart: unless-stopped environment: NETWORK: ${NBITCOIN_NETWORK:-regtest} SPARK_OPT: --no-tls --port 9739 -C /data/.cookie volumes: - - "clightning_groestlcoin_datadir:/etc/lightning" - - "clightning_groestlcoin_spark:/data" + - "clightning_groestlcoin_datadir:/etc/lightning" + - "clightning_groestlcoin_spark:/data" links: - - clightning_groestlcoin + - clightning_groestlcoin expose: - - "9739" + - "9739" volumes: clightning_groestlcoin_datadir: clightning_groestlcoin_charge: diff --git a/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml b/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml index 79ba5a0..9616513 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-eclair.yml @@ -32,8 +32,8 @@ services: -Declair.bitcoind.zmqblock=tcp://groestlcoind:21441 -Declair.bitcoind.zmqtx=tcp://groestlcoind:21441 expose: - - "9735" # server port - - "8080" # api port + - "9735" # server port + - "8080" # api port volumes: - "groestlcoin_datadir:/etc/groestlcoin" - "eclair_groestlcoin_datadir:/data" @@ -51,4 +51,4 @@ volumes: required: - "opt-add-zmq" - - "opt-txindex" \ No newline at end of file + - "opt-txindex" diff --git a/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml b/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml index acfc3d4..4cd4b5b 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin-lnd.yml @@ -61,4 +61,4 @@ volumes: lnd_groestlcoin_datadir: required: - - "opt-add-zmq" \ No newline at end of file + - "opt-add-zmq" diff --git a/docker-compose-generator/docker-fragments/groestlcoin.yml b/docker-compose-generator/docker-fragments/groestlcoin.yml index e34985e..4d139eb 100644 --- a/docker-compose-generator/docker-fragments/groestlcoin.yml +++ b/docker-compose-generator/docker-fragments/groestlcoin.yml @@ -2,30 +2,30 @@ version: "3" services: groestlcoind: - restart: unless-stopped - container_name: btcpayserver_groestlcoind - image: groestlcoin/docker-groestlcoin:2.19.1 - environment: - GROESTLCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "groestlcoin_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_groestlcoind + image: groestlcoin/docker-groestlcoin:2.20.1 + environment: + GROESTLCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "groestlcoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "grs" - NBXPLORER_GRSRPCURL: http://groestlcoind:43782/ - NBXPLORER_GRSNODEENDPOINT: groestlcoind:39388 - volumes: - - "groestlcoin_datadir:/root/.groestlcoin" + environment: + NBXPLORER_CHAINS: "grs" + NBXPLORER_GRSRPCURL: http://groestlcoind:43782/ + NBXPLORER_GRSNODEENDPOINT: groestlcoind:39388 + volumes: + - "groestlcoin_datadir:/root/.groestlcoin" btcpayserver: - environment: - BTCPAY_CHAINS: "grs" - BTCPAY_GRSEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "grs" + BTCPAY_GRSEXPLORERURL: http://nbxplorer:32838/ volumes: groestlcoin_datadir: diff --git a/docker-compose-generator/docker-fragments/liquid.yml b/docker-compose-generator/docker-fragments/liquid.yml index 9a7365b..0b3000f 100644 --- a/docker-compose-generator/docker-fragments/liquid.yml +++ b/docker-compose-generator/docker-fragments/liquid.yml @@ -2,37 +2,37 @@ version: "3" services: elementsd_liquid: - restart: unless-stopped - container_name: btcpayserver_elementsd_liquid - image: btcpayserver/elements:0.18.1.7 - environment: - ELEMENTS_NETWORK: ${NBITCOIN_NETWORK:-regtest} - ELEMENTS_MAINNET_CHAIN: "liquidv1" - ELEMENTS_WALLETDIR: "/walletdata" - ELEMENTS_EXTRA_ARGS: | - rpcport=43782 - rpcbind=0.0.0.0:43782 - rpcauth=liquid:c8bf1a8961d97f224cb21224aaa8235d$$402f4a8907683d057b8c58a42940b6e54d1638322a42986ae28ebb844e603ae6 - port=39388 - whitelist=0.0.0.0/0 - validatepegin=0 - prune=5000 - fallbackfee=0.000001 - expose: - - "43782" - - "39388" - volumes: - - "elements_datadir:/data" - - "elements_wallet_datadir:/walletdata" + restart: unless-stopped + container_name: btcpayserver_elementsd_liquid + image: btcpayserver/elements:0.18.1.7 + environment: + ELEMENTS_NETWORK: ${NBITCOIN_NETWORK:-regtest} + ELEMENTS_MAINNET_CHAIN: "liquidv1" + ELEMENTS_WALLETDIR: "/walletdata" + ELEMENTS_EXTRA_ARGS: | + rpcport=43782 + rpcbind=0.0.0.0:43782 + rpcauth=liquid:c8bf1a8961d97f224cb21224aaa8235d$$402f4a8907683d057b8c58a42940b6e54d1638322a42986ae28ebb844e603ae6 + port=39388 + whitelist=0.0.0.0/0 + validatepegin=0 + prune=5000 + fallbackfee=0.000001 + expose: + - "43782" + - "39388" + volumes: + - "elements_datadir:/data" + - "elements_wallet_datadir:/walletdata" nbxplorer: - environment: - NBXPLORER_CHAINS: "lbtc" - NBXPLORER_LBTCRPCURL: http://elementsd_liquid:43782/ - NBXPLORER_LBTCNODEENDPOINT: elementsd_liquid:39388 - NBXPLORER_LBTCRPCUSER: "liquid" - NBXPLORER_LBTCRPCPASSWORD: "liquid" - volumes: - - "elements_datadir:/root/.elements" + environment: + NBXPLORER_CHAINS: "lbtc" + NBXPLORER_LBTCRPCURL: http://elementsd_liquid:43782/ + NBXPLORER_LBTCNODEENDPOINT: elementsd_liquid:39388 + NBXPLORER_LBTCRPCUSER: "liquid" + NBXPLORER_LBTCRPCPASSWORD: "liquid" + volumes: + - "elements_datadir:/root/.elements" btcpayserver: environment: BTCPAY_CHAINS: "lbtc" diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml index 29363a9..7bd5db8 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: btcpayserver/lightning:v0.7.3 + image: btcpayserver/lightning:v0.9.0-1 container_name: btcpayserver_clightning_litecoin restart: unless-stopped environment: @@ -31,4 +31,4 @@ services: links: - clightning_litecoin volumes: - clightning_litecoin_datadir: \ No newline at end of file + clightning_litecoin_datadir: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml index c049c00..290fd24 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:v0.10.2-beta + image: btcpayserver/lnd:v0.11.0-beta container_name: btcpayserver_lnd_litecoin restart: unless-stopped environment: @@ -49,4 +49,4 @@ volumes: lnd_litecoin_datadir: required: - - "opt-add-zmq" \ No newline at end of file + - "opt-add-zmq" diff --git a/docker-compose-generator/docker-fragments/litecoin.yml b/docker-compose-generator/docker-fragments/litecoin.yml index 18d2448..f58ced3 100644 --- a/docker-compose-generator/docker-fragments/litecoin.yml +++ b/docker-compose-generator/docker-fragments/litecoin.yml @@ -17,16 +17,16 @@ services: volumes: - "litecoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "ltc" - NBXPLORER_LTCRPCURL: http://litecoind:43782/ - NBXPLORER_LTCNODEENDPOINT: litecoind:39388 - volumes: - - "litecoin_datadir:/root/.litecoin" + environment: + NBXPLORER_CHAINS: "ltc" + NBXPLORER_LTCRPCURL: http://litecoind:43782/ + NBXPLORER_LTCNODEENDPOINT: litecoind:39388 + volumes: + - "litecoin_datadir:/root/.litecoin" btcpayserver: - environment: - BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "ltc" + environment: + BTCPAY_LTCEXPLORERURL: http://nbxplorer:32838/ + BTCPAY_CHAINS: "ltc" volumes: - litecoin_datadir: \ No newline at end of file + litecoin_datadir: diff --git a/docker-compose-generator/docker-fragments/monacoin.yml b/docker-compose-generator/docker-fragments/monacoin.yml index c60a827..5331c99 100644 --- a/docker-compose-generator/docker-fragments/monacoin.yml +++ b/docker-compose-generator/docker-fragments/monacoin.yml @@ -17,16 +17,16 @@ services: volumes: - "monacoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "mona" - NBXPLORER_MONARPCURL: http://monacoind:43782/ - NBXPLORER_MONANODEENDPOINT: monacoind:39388 - volumes: - - "monacoin_datadir:/root/.monacoin" + environment: + NBXPLORER_CHAINS: "mona" + NBXPLORER_MONARPCURL: http://monacoind:43782/ + NBXPLORER_MONANODEENDPOINT: monacoind:39388 + volumes: + - "monacoin_datadir:/root/.monacoin" btcpayserver: - environment: - BTCPAY_MONAEXPLORERURL: http://nbxplorer:32838/ - BTCPAY_CHAINS: "mona" + environment: + BTCPAY_MONAEXPLORERURL: http://nbxplorer:32838/ + BTCPAY_CHAINS: "mona" volumes: - monacoin_datadir: + monacoin_datadir: diff --git a/docker-compose-generator/docker-fragments/monero.yml b/docker-compose-generator/docker-fragments/monero.yml index 7765d49..7edb63f 100644 --- a/docker-compose-generator/docker-fragments/monero.yml +++ b/docker-compose-generator/docker-fragments/monero.yml @@ -4,8 +4,8 @@ services: monerod: restart: unless-stopped container_name: btcpayserver_monerod - image: btcpayserver/monero:0.15.0.1-amd64 - entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain + image: btcpayserver/monero:0.17.1.8 + entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain --enable-dns-blocklist expose: - "18081" volumes: @@ -13,7 +13,7 @@ services: monerod_wallet: restart: unless-stopped container_name: btcpayserver_monero_wallet - image: btcpayserver/monero:0.15.0.1-amd64 + image: btcpayserver/monero:0.17.1.8 entrypoint: monero-wallet-rpc --rpc-bind-ip=0.0.0.0 --disable-rpc-login --confirm-external-bind --rpc-bind-port=18082 --non-interactive --trusted-daemon --daemon-address=monerod:18081 --wallet-file=/wallet/wallet --password-file=/wallet/password --tx-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s" expose: - "18082" diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index bf610c9..f1f25ee 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,8 +4,8 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.1.40 - expose: + image: nicolasdorier/nbxplorer:2.1.46 + expose: - "32838" environment: NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-regtest} @@ -16,4 +16,4 @@ services: - "nbxplorer_datadir:/datadir" volumes: - nbxplorer_datadir: + nbxplorer_datadir: diff --git a/docker-compose-generator/docker-fragments/nginx-https.yml b/docker-compose-generator/docker-fragments/nginx-https.yml index eb46cc1..9f85204 100644 --- a/docker-compose-generator/docker-fragments/nginx-https.yml +++ b/docker-compose-generator/docker-fragments/nginx-https.yml @@ -26,4 +26,4 @@ services: nginx-gen: volumes: - - "nginx_certs:/etc/nginx/certs:ro" \ No newline at end of file + - "nginx_certs:/etc/nginx/certs:ro" diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 2865f2b..c467bf9 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -28,14 +28,14 @@ services: - btcpayserver - nginx volumes: - nginx_conf: - nginx_vhost: - nginx_html: - nginx_certs: + nginx_conf: + nginx_vhost: + nginx_html: + nginx_certs: exclusive: - proxy required: - "btcpayserver-nginx" recommended: - - "nginx-https" \ No newline at end of file + - "nginx-https" diff --git a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml index c1f42a6..222807f 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btcqbo.yml @@ -11,7 +11,7 @@ services: CALLBACK_URL: ${BTCPAY_PROTOCOL:-https}://${BTCPAY_HOST}/btcqbo/qbologged expose: - "8001" - links: + links: - redis redis: image: redis:5.0.2-alpine @@ -23,4 +23,4 @@ services: environment: BTCPAY_EXTERNALSERVICES: "Quickbooks Online Connector:btcqbo;" volumes: - redis_datadir: + redis_datadir: diff --git a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml index 05cb4fe..d001ae9 100644 --- a/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml +++ b/docker-compose-generator/docker-fragments/opt-add-btctransmuter.yml @@ -26,10 +26,10 @@ services: - postgres - nbxplorer volumes: - - "btctransmuter_datadir:/app/data" - - "nbxplorer_datadir:/root/.nbxplorer" + - "btctransmuter_datadir:/app/data" + - "nbxplorer_datadir:/root/.nbxplorer" btcpayserver: environment: BTCPAY_EXTERNALSERVICES: "BTC Transmuter:btctransmuter;" volumes: - btctransmuter_datadir: + btctransmuter_datadir: diff --git a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml index 98ba262..5758efd 100644 --- a/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml +++ b/docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml @@ -6,7 +6,7 @@ services: BITCOIN_EXTRA_ARGS: | rpcauth=eps:3d1cff5ee81ddeb3ba94483150310e74$$4626aeb95b2a2b066eac8833c1ad936f65cf7492aa836ec8f173ff65ac428a0e electrum_ps: - image: btcpayserver/eps:0.2.0 + image: btcpayserver/eps:0.2.1.1 restart: unless-stopped ports: - "50002:50002" @@ -36,4 +36,3 @@ services: - "nbxplorer_datadir:/root/.nbxplorer" volumes: electrum_ps_datadir: - diff --git a/docker-compose-generator/docker-fragments/opt-add-ndlc.yml b/docker-compose-generator/docker-fragments/opt-add-ndlc.yml new file mode 100644 index 0000000..16ad4c1 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-add-ndlc.yml @@ -0,0 +1,10 @@ +version: '3' +services: + ndlc: + container_name: ndlci_cli + image: nicolasdorier/ndlc-cli:1.0.1 + restart: 'no' + volumes: + - "ndlc_cli_datadir:/root/.ndlc" +volumes: + ndlc_cli_datadir: \ No newline at end of file diff --git a/docker-compose-generator/docker-fragments/opt-add-pihole.yml b/docker-compose-generator/docker-fragments/opt-add-pihole.yml index b93b7e1..b2d7a9c 100644 --- a/docker-compose-generator/docker-fragments/opt-add-pihole.yml +++ b/docker-compose-generator/docker-fragments/opt-add-pihole.yml @@ -19,4 +19,4 @@ services: - "./pihole/resolv.conf:/etc/resolv.conf:ro" - "pihole_datadir:/etc/pihole" volumes: - pihole_datadir: \ No newline at end of file + pihole_datadir: diff --git a/docker-compose-generator/docker-fragments/opt-add-teos.yml b/docker-compose-generator/docker-fragments/opt-add-teos.yml index 85ab6b5..1547836 100644 --- a/docker-compose-generator/docker-fragments/opt-add-teos.yml +++ b/docker-compose-generator/docker-fragments/opt-add-teos.yml @@ -32,4 +32,4 @@ volumes: required: - "opt-add-zmq" - "bitcoin" - - "opt-txindex" + - "opt-txindex" diff --git a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml index 88bcca4..b3f14f6 100644 --- a/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml +++ b/docker-compose-generator/docker-fragments/opt-add-thunderhub.yml @@ -2,22 +2,22 @@ version: "3" services: btcpayserver: environment: - BTCPAY_BTCEXTERNALTHUNDERHUB: "server=/thub/;cookiefile=/etc/lnd_bitcoin_thub_datadir/.cookie" + BTCPAY_BTCEXTERNALTHUNDERHUB: "server=/thub/sso;cookiefile=/etc/lnd_bitcoin_thub_datadir/.cookie" volumes: - "lnd_bitcoin_thub_datadir:/etc/lnd_bitcoin_thub_datadir" bitcoin_thub: - image: apotdevin/thunderhub:v0.8.13 + image: apotdevin/thunderhub:base-v0.12.0 restart: unless-stopped stop_signal: SIGKILL environment: - BASE_PATH: "/thub" - HODL_KEY: "XQ86AOqw7Of8qMDql901mcZkuHL2nRel5FA9H2Ie4rTLeBKn0VlO5GuXvdVRogWrDOuH5V0E51Qxy9Bo" + NO_VERSION_CHECK: "true" COOKIE_PATH: "/data/.cookie" SSO_SERVER_URL: "lnd_bitcoin:10009" SSO_MACAROON_PATH: "/etc/lnd" SSO_CERT_PATH: "/etc/lnd/tls.cert" NO_CLIENT_ACCOUNTS: "true" LOG_LEVEL: debug + LOGOUT_URL: "/server/services/thunderhub/BTC" volumes: - "lnd_bitcoin_datadir:/etc/lnd" - "lnd_bitcoin_thub_datadir:/data" diff --git a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml index e7f00a0..55f61fc 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml @@ -14,7 +14,7 @@ services: environment: TOR_RELAY_NICKNAME: ${TOR_RELAY_NICKNAME} TOR_RELAY_EMAIL: ${TOR_RELAY_EMAIL} - + tor-relay: restart: unless-stopped image: btcpayserver/tor:0.4.2.7 @@ -25,9 +25,9 @@ services: volumes: - "tor_relay_datadir:/home/tor/.tor" - "tor_relay_torrcdir:/usr/local/etc/tor" - ports: + ports: - "9001:9001" - - "9030:9030" + - "9030:9030" volumes: tor_relay_datadir: - tor_relay_torrcdir: \ No newline at end of file + tor_relay_torrcdir: diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index a75fd22..d5b22f9 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -1,5 +1,5 @@ -# This will expose BTCPayServer, Woocommerce, your lightning nodes as hidden services and accept onion peers for your full node. -# Warning: This options is for working around NAT and firewall problems as well as to help protect your customer's privacy. +# This will expose BTCPayServer, Woocommerce, your lightning nodes as hidden services and accept onion peers for your full node. +# Warning: This options is for working around NAT and firewall problems as well as to help protect your customer's privacy. # This will not protect your privacy against a targeted attack against your own privacy. # All outbound traffic is not channeled through the TOR SOCKS proxy version: "3" @@ -15,7 +15,7 @@ services: volumes: - "tor_servicesdir:/var/lib/tor/hidden_services" - "tor_torrcdir:/usr/local/etc/tor/" - + btctransmuter: environment: HIDDENSERVICE_NAME: BTCTransmuter @@ -25,7 +25,7 @@ services: volumes: - "tor_servicesdir:/var/lib/tor/hidden_services" - "tor_torrcdir:/usr/local/etc/tor/" - + configurator: environment: HIDDENSERVICE_NAME: Configurator @@ -33,7 +33,7 @@ services: volumes: - "tor_servicesdir:/var/lib/tor/hidden_services" - "tor_torrcdir:/usr/local/etc/tor/" - + woocommerce: environment: HIDDENSERVICE_NAME: WooCommerce @@ -56,9 +56,9 @@ services: # Be careful if you copy the line below from the docker-compose.yml! A dollar sign is escaped. rpcauth=btcrpc:a6a5d29a3f44f02e4cd8cabb5b10a234$$ab6152915515f6a9cca806d2ab5f0e2794c346ba74f812c61e48241d523778b8 volumes: - - "tor_datadir:/home/tor/.tor" + - "tor_datadir:/home/tor/.tor" links: - - tor + - tor nginx: volumes: @@ -77,8 +77,8 @@ services: TOR_EXTRA_ARGS: | CookieAuthentication 1 expose: - - "9050" # SOCKS - - "9051" # Tor Control + - "9050" # SOCKS + - "9051" # Tor Control volumes: - "tor_datadir:/home/tor/.tor" - "tor_torrcdir:/usr/local/etc/tor" @@ -175,6 +175,6 @@ services: - "tor_servicesdir:/var/lib/tor/hidden_services" - "tor_torrcdir:/usr/local/etc/tor/" volumes: - tor_datadir: - tor_torrcdir: - tor_servicesdir: + tor_datadir: + tor_torrcdir: + tor_servicesdir: diff --git a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml index f9af887..9af0fa3 100644 --- a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml +++ b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml @@ -2,7 +2,7 @@ version: '3' services: woocommerce: - image: btcpayserver/docker-woocommerce:3.0.6-3 + image: btcpayserver/docker-woocommerce:3.0.6-wordpress-5.5.3-php-7.4.12 environment: WOOCOMMERCE_HOST: ${WOOCOMMERCE_HOST} WORDPRESS_DB_HOST: mariadb @@ -32,8 +32,8 @@ services: - "mariadb_datadir:/var/lib/mysql" btcpayserver: - environment: - BTCPAY_EXTERNALSERVICES: "WooCommerce:${BTCPAY_PROTOCOL:-https}://${WOOCOMMERCE_HOST};" + environment: + BTCPAY_EXTERNALSERVICES: "WooCommerce:${BTCPAY_PROTOCOL:-https}://${WOOCOMMERCE_HOST};" volumes: woocommerce_html: - mariadb_datadir: \ No newline at end of file + mariadb_datadir: diff --git a/docker-compose-generator/docker-fragments/opt-expose-unsafe.yml b/docker-compose-generator/docker-fragments/opt-expose-unsafe.yml index e8ec3f6..322ac4a 100644 --- a/docker-compose-generator/docker-fragments/opt-expose-unsafe.yml +++ b/docker-compose-generator/docker-fragments/opt-expose-unsafe.yml @@ -3,5 +3,5 @@ version: "3" services: bitcoind: - ports: - - "8333:39388" + ports: + - "8333:39388" diff --git a/docker-compose-generator/docker-fragments/opt-lnd-keysend.yml b/docker-compose-generator/docker-fragments/opt-lnd-keysend.yml new file mode 100644 index 0000000..1088f29 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-lnd-keysend.yml @@ -0,0 +1,7 @@ +version: "3" + +services: + lnd_bitcoin: + environment: + LND_EXTRA_ARGS: | + accept-keysend=1 diff --git a/docker-compose-generator/docker-fragments/opt-monero-expose.yml b/docker-compose-generator/docker-fragments/opt-monero-expose.yml new file mode 100644 index 0000000..d7cf147 --- /dev/null +++ b/docker-compose-generator/docker-fragments/opt-monero-expose.yml @@ -0,0 +1,8 @@ +version: "3" + +services: + monerod: + ports: + - "127.0.0.1:18081:18081" +required: + - "monero" diff --git a/docker-compose-generator/docker-fragments/opt-more-memory.yml b/docker-compose-generator/docker-fragments/opt-more-memory.yml index 84cf504..11078b5 100644 --- a/docker-compose-generator/docker-fragments/opt-more-memory.yml +++ b/docker-compose-generator/docker-fragments/opt-more-memory.yml @@ -35,4 +35,4 @@ services: ELEMENTS_EXTRA_ARGS: | dbcache=1024 exclusive: - - memory \ No newline at end of file + - memory diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-s.yml b/docker-compose-generator/docker-fragments/opt-save-storage-s.yml index 75c53a3..b6c518b 100644 --- a/docker-compose-generator/docker-fragments/opt-save-storage-s.yml +++ b/docker-compose-generator/docker-fragments/opt-save-storage-s.yml @@ -31,4 +31,4 @@ services: environment: BITCOIN_EXTRA_ARGS: prune=50000 exclusive: - - pruning \ No newline at end of file + - pruning diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml b/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml index 23b9bad..90120c7 100644 --- a/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml +++ b/docker-compose-generator/docker-fragments/opt-save-storage-xs.yml @@ -31,4 +31,4 @@ services: environment: BITCOIN_EXTRA_ARGS: prune=25000 exclusive: - - pruning \ No newline at end of file + - pruning diff --git a/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml b/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml index e8d928e..43d9040 100644 --- a/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml +++ b/docker-compose-generator/docker-fragments/opt-save-storage-xxs.yml @@ -31,4 +31,4 @@ services: environment: BITCOIN_EXTRA_ARGS: prune=5000 exclusive: - - pruning \ No newline at end of file + - pruning diff --git a/docker-compose-generator/docker-fragments/opt-save-storage.yml b/docker-compose-generator/docker-fragments/opt-save-storage.yml index cb16999..c972779 100644 --- a/docker-compose-generator/docker-fragments/opt-save-storage.yml +++ b/docker-compose-generator/docker-fragments/opt-save-storage.yml @@ -31,4 +31,4 @@ services: environment: BITCOIN_EXTRA_ARGS: prune=100000 exclusive: - - pruning \ No newline at end of file + - pruning diff --git a/docker-compose-generator/docker-fragments/opt-txindex.yml b/docker-compose-generator/docker-fragments/opt-txindex.yml index d3cd9b9..97284ab 100644 --- a/docker-compose-generator/docker-fragments/opt-txindex.yml +++ b/docker-compose-generator/docker-fragments/opt-txindex.yml @@ -1,5 +1,5 @@ version: "3" -# must not use opt-save-storage +# must not use opt-save-storage services: bitcoind: @@ -31,4 +31,4 @@ services: BITCOIN_EXTRA_ARGS: | txindex=1 incompatible: - - pruning \ No newline at end of file + - pruning diff --git a/docker-compose-generator/docker-fragments/postgres.yml b/docker-compose-generator/docker-fragments/postgres.yml index d558564..163aedf 100644 --- a/docker-compose-generator/docker-fragments/postgres.yml +++ b/docker-compose-generator/docker-fragments/postgres.yml @@ -3,9 +3,11 @@ version: "3" services: postgres: restart: unless-stopped - image: postgres:9.6.5 + image: postgres:9.6.20 + environment: + POSTGRES_HOST_AUTH_METHOD: trust volumes: - "postgres_datadir:/var/lib/postgresql/data" volumes: - postgres_datadir: \ No newline at end of file + postgres_datadir: diff --git a/docker-compose-generator/docker-fragments/traefik.yml b/docker-compose-generator/docker-fragments/traefik.yml index 65037ff..52612b1 100644 --- a/docker-compose-generator/docker-fragments/traefik.yml +++ b/docker-compose-generator/docker-fragments/traefik.yml @@ -14,7 +14,7 @@ services: - "./acme.json:/acme.json:ro" - "./servers.toml:/servers.toml" - "./traefik_logs:/traefik_logs" - + links: - btcpayserver @@ -24,4 +24,4 @@ volumes: exclusive: - proxy required: - - "traefik" \ No newline at end of file + - "traefik" diff --git a/docker-compose-generator/docker-fragments/trezarcoin.yml b/docker-compose-generator/docker-fragments/trezarcoin.yml index 288ddba..23bbaba 100644 --- a/docker-compose-generator/docker-fragments/trezarcoin.yml +++ b/docker-compose-generator/docker-fragments/trezarcoin.yml @@ -2,34 +2,34 @@ version: "3" services: trezarcoind: - restart: unless-stopped - container_name: btcpayserver_trezarcoind - image: chekaz/docker-trezarcoin:0.13.0 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "trezarcoin_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_trezarcoind + image: chekaz/docker-trezarcoin:0.13.0 + environment: + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "trezarcoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "tzc" - NBXPLORER_TZCRPCURL: http://trezarcoind:43782/ - NBXPLORER_TZCNODEENDPOINT: trezarcoind:39388 - NBXPLORER_TZCRPCUSER: "NBXPLORER_TZCRPCUSER" - NBXPLORER_TZCRPCPASSWORD: "NBXPLORER_TZCRPCPASS" - links: - - trezarcoind - volumes: - - "trezarcoin_datadir:/root/.trezarcoin" + environment: + NBXPLORER_CHAINS: "tzc" + NBXPLORER_TZCRPCURL: http://trezarcoind:43782/ + NBXPLORER_TZCNODEENDPOINT: trezarcoind:39388 + NBXPLORER_TZCRPCUSER: "NBXPLORER_TZCRPCUSER" + NBXPLORER_TZCRPCPASSWORD: "NBXPLORER_TZCRPCPASS" + links: + - trezarcoind + volumes: + - "trezarcoin_datadir:/root/.trezarcoin" btcpayserver: - environment: - BTCPAY_CHAINS: "tzc" - BTCPAY_TZCEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "tzc" + BTCPAY_TZCEXPLORERURL: http://nbxplorer:32838/ volumes: trezarcoin_datadir: diff --git a/docker-compose-generator/docker-fragments/viacoin.yml b/docker-compose-generator/docker-fragments/viacoin.yml index b6dc015..8d54dc9 100644 --- a/docker-compose-generator/docker-fragments/viacoin.yml +++ b/docker-compose-generator/docker-fragments/viacoin.yml @@ -2,30 +2,30 @@ version: "3" services: viacoind: - restart: unless-stopped - container_name: btcpayserver_viacoind - image: romanornr/docker-viacoin:0.15.2 - environment: - BITCOIN_EXTRA_ARGS: | - rpcport=43782 - ${NBITCOIN_NETWORK:-regtest}=1 - port=39388 - whitelist=0.0.0.0/0 - expose: - - "43782" - - "39388" - volumes: - - "viacoin_datadir:/data" + restart: unless-stopped + container_name: btcpayserver_viacoind + image: romanornr/docker-viacoin:0.15.2 + environment: + BITCOIN_EXTRA_ARGS: | + rpcport=43782 + ${NBITCOIN_NETWORK:-regtest}=1 + port=39388 + whitelist=0.0.0.0/0 + expose: + - "43782" + - "39388" + volumes: + - "viacoin_datadir:/data" nbxplorer: - environment: - NBXPLORER_CHAINS: "via" - NBXPLORER_VIARPCURL: http://viacoind:43782/ - NBXPLORER_VIANODEENDPOINT: viacoind:39388 - volumes: - - "viacoin_datadir:/root/.viacoin" + environment: + NBXPLORER_CHAINS: "via" + NBXPLORER_VIARPCURL: http://viacoind:43782/ + NBXPLORER_VIANODEENDPOINT: viacoind:39388 + volumes: + - "viacoin_datadir:/root/.viacoin" btcpayserver: - environment: - BTCPAY_CHAINS: "via" - BTCPAY_VIAEXPLORERURL: http://nbxplorer:32838/ + environment: + BTCPAY_CHAINS: "via" + BTCPAY_VIAEXPLORERURL: http://nbxplorer:32838/ volumes: viacoin_datadir: diff --git a/docs/ndlc.md b/docs/ndlc.md new file mode 100644 index 0000000..a6128c7 --- /dev/null +++ b/docs/ndlc.md @@ -0,0 +1,45 @@ +# NDLC support + +DISCLAIMER: THIS PROJECT IS EXPERIMENTAL BASED ON A PROTOCOL WHICH IS STILL EVOLVING EVERYDAY. USE WITH CAUTION. + +I WILL TAKE NO ATTEMPT AT MAINTAINING BACKWARD COMPATIBILITY AT THIS STAGE. + +## Introduction + +A DLC can be seen as a smart contract involving two `parties`, a future `event`, a set of outcomes and a `payoff function`. +An `outcome` can be `attested` by an `oracle`. The `oracle` does not need to interact with either party, and its only role is to `attest` the outcome of the event. + +The `payoff function` determines the two parties' profit or loss depending on which outcome get `attested`. + +The `oracle` roles is to define the `event` and `attest` a single outcome of the event. + +Let's call Alice and Bob the two parties of the contract, and Olivia the oracle. + +A DLC will show two transactions on the chain: +* The Funding Transaction +* The Contract Execution Transaction (CET) + +The `Funding Transaction` is a transaction built by the two parties of the contract, locking their collateral for the contract. + +The `Contract Execution Transaction` (or `CET`) is the transaction distributing the locked collateral according to the `payoff function` for the outcome attested by the oracle. + +The following documentation is also explained in this video. + +[](https://youtu.be/DakwshnNkho) + +## How to use + +You need to add ndlc's docker fragment to your install with: + +```bash +BTCPAYGEN_ADDITIONAL_FRAGMENTS="$BTCPAYGEN_ADDITIONAL_FRAGMENTS;opt-add-ndlc" +. btcpay-setup.sh -i +``` + +You can then use `ndlc-cli.sh` to run use ndlc-cli, for example: + +```bash +ndlc.sh oracle generate MyOwnOracle +``` + +Read our documentation on our [github repository](https://github.com/dgarage/NDLC/blob/master/docs/Concepts.md). \ No newline at end of file diff --git a/helpers.sh b/helpers.sh index 605be6e..741a6a4 100755 --- a/helpers.sh +++ b/helpers.sh @@ -18,6 +18,7 @@ install_tooling() { "btcpayserver_trezarcoind" "trezarcoin-cli.sh" "Command line for your Trezar instance" \ "btcpayserver_viacoind" "viacoin-cli.sh" "Command line for your Viacoin instance" \ "btcpayserver_elementsd" "elements-cli.sh" "Command line for your Elements/Liquid instance" \ + "ndlci_cli" "ndlc-cli.sh" "Command line for NDLC-CLI" \ "pihole" "pihole.sh" "Command line for running pihole commands" \ "*" "btcpay-clean.sh" "Command line for deleting old unused docker images" \ "*" "btcpay-down.sh" "Command line for stopping all services related to BTCPay Server" \ diff --git a/ndlc-cli.sh b/ndlc-cli.sh new file mode 100755 index 0000000..7786d30 --- /dev/null +++ b/ndlc-cli.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +pushd . > /dev/null +cd "$(dirname "$BTCPAY_ENV_FILE")" +docker-compose -f $BTCPAY_DOCKER_COMPOSE run --rm ndlc "$@" +popd > /dev/null