Merge remote-tracking branch 'upstream/master'

7 years ago · 614bfa0c60
21 changed files with 219 additions and 57 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -11,6 +11,7 @@

 # Declare files that will always have CRLF line endings on checkout.
 *.sh text eol=lf
+*.yml text eof=lf

 # Denote all files that are truly binary and should not be modified.
 *.png binary
--- a/Production-NoReverseProxy/docker-compose.btc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-clightning.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -32,7 +32,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -67,14 +67,15 @@ services:
    volumes:
    - "bitcoin_datadir:/data"
  clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_bitcoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/bitcoin
        bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=btc
--- a/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc-clightning.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -36,7 +36,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -75,15 +75,15 @@ services:
    volumes:
    - "litecoin_datadir:/data"
  clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_litecoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/litecoin
        bitcoin-rpcconnect=litecoind
-        port=9736
-        ipaddr=${BTCPAY_HOST}:9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=ltc
@ -91,7 +91,7 @@ services:
    - "clightning_litecoin_datadir:/root/.lightning"
    - "litecoin_datadir:/etc/litecoin"
    ports:
-    - "9736:9736"
+    - "9736:9735"
    links:
    - litecoind
  bitcoind:
@ -110,14 +110,15 @@ services:
    volumes:
    - "bitcoin_datadir:/data"
  clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_bitcoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/bitcoin
        bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=btc
--- a/Production-NoReverseProxy/docker-compose.btc-ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc-ltc.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -30,7 +30,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/Production-NoReverseProxy/docker-compose.btc.yml
+++ b/Production-NoReverseProxy/docker-compose.btc.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -29,7 +29,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc-clightning.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -32,7 +32,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -67,15 +67,15 @@ services:
    volumes:
    - "litecoin_datadir:/data"
  clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_litecoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/litecoin
        bitcoin-rpcconnect=litecoind
-        port=9736
-        ipaddr=${BTCPAY_HOST}:9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=ltc
@ -83,7 +83,7 @@ services:
    - "clightning_litecoin_datadir:/root/.lightning"
    - "litecoin_datadir:/etc/litecoin"
    ports:
-    - "9736:9736"
+    - "9736:9735"
    links:
    - litecoind
 volumes:
--- a/Production-NoReverseProxy/docker-compose.ltc.yml
+++ b/Production-NoReverseProxy/docker-compose.ltc.yml
@ -2,7 +2,7 @@ version: "3"
 services:
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -29,7 +29,7 @@ services:
    - "80:49392"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/Production/docker-compose.btc-clightning.yml
+++ b/Production/docker-compose.btc-clightning.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -74,7 +74,7 @@ services:
    - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -109,14 +109,15 @@ services:
    volumes:
    - "bitcoin_datadir:/data"
  clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_bitcoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/bitcoin
        bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=btc
--- a/Production/docker-compose.btc-ltc-clightning.yml
+++ b/Production/docker-compose.btc-ltc-clightning.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -78,7 +78,7 @@ services:
    - "clightning_bitcoin_datadir:/etc/clightning_bitcoin"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -117,15 +117,15 @@ services:
    volumes:
    - "litecoin_datadir:/data"
  clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_litecoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/litecoin
        bitcoin-rpcconnect=litecoind
-        port=9736
-        ipaddr=${BTCPAY_HOST}:9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=ltc
@ -133,7 +133,7 @@ services:
    - "clightning_litecoin_datadir:/root/.lightning"
    - "litecoin_datadir:/etc/litecoin"
    ports:
-    - "9736:9736"
+    - "9736:9735"
    links:
    - litecoind
  bitcoind:
@ -152,14 +152,15 @@ services:
    volumes:
    - "bitcoin_datadir:/data"
  clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_bitcoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/bitcoin
        bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=btc
--- a/Production/docker-compose.btc-ltc.yml
+++ b/Production/docker-compose.btc-ltc.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -72,7 +72,7 @@ services:
    - "nbxplorer_datadir:/root/.nbxplorer"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/Production/docker-compose.btc.yml
+++ b/Production/docker-compose.btc.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -71,7 +71,7 @@ services:
    - "nbxplorer_datadir:/root/.nbxplorer"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/Production/docker-compose.ltc-clightning.yml
+++ b/Production/docker-compose.ltc-clightning.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -74,7 +74,7 @@ services:
    - "clightning_litecoin_datadir:/etc/clightning_litecoin"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
@ -109,15 +109,15 @@ services:
    volumes:
    - "litecoin_datadir:/data"
  clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_litecoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/litecoin
        bitcoin-rpcconnect=litecoind
-        port=9736
-        ipaddr=${BTCPAY_HOST}:9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=ltc
@ -125,7 +125,7 @@ services:
    - "clightning_litecoin_datadir:/root/.lightning"
    - "litecoin_datadir:/etc/litecoin"
    ports:
-    - "9736:9736"
+    - "9736:9735"
    links:
    - litecoind
 volumes:
--- a/Production/docker-compose.ltc.yml
+++ b/Production/docker-compose.ltc.yml
@ -46,7 +46,7 @@ services:
    - nginx-gen
  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
    - "49392"
    environment:
@ -71,7 +71,7 @@ services:
    - "nbxplorer_datadir:/root/.nbxplorer"
  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose:
    - "32838"
    environment:
--- a/docker-compose-generator/.dockerignore
+++ b/docker-compose-generator/.dockerignore
@ -0,0 +1,124 @@
+# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
+**/[Bb]in/
+**/[Oo]bj/
+node_modules/
+dist/
+
+# mstest test results
+TestResults
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.log
+*.vspscc
+*.vssscc
+.builds
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder 
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# NuGet Packages Directory
+packages
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+[Tt]est[Rr]esult*
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+src/Rapporteringsregisteret.Web/assets/less/*.css
+
+MetricResults/
+*.sln.ide/
+
+_configs/
+
+# vnext stuff
+bower_components
+output
+
+.vs
+**/launchSettings.json
--- a/docker-compose-generator/Dockerfile
+++ b/docker-compose-generator/Dockerfile
@ -0,0 +1,19 @@
+FROM microsoft/aspnetcore-build:2.0.6-2.1.101-stretch AS builder
+WORKDIR /source
+COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
+# Cache some dependencies
+RUN dotnet restore
+COPY src/. .
+RUN dotnet publish --output /app/ --configuration Release
+
+FROM microsoft/aspnetcore:2.0.6-stretch
+WORKDIR /app
+
+RUN mkdir /datadir
+ENV APP_DATADIR=/datadir
+VOLUME /datadir
+
+COPY --from=builder "/app" .
+COPY docker-fragments docker-fragments
+
+ENTRYPOINT ["dotnet", "docker-compose-generator.dll"]
--- a/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/bitcoin-clightning.yml
@ -2,14 +2,15 @@ version: "3"

 services:
  clightning_bitcoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_bitcoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/bitcoin
        bitcoin-rpcconnect=bitcoind
-        ipaddr=${BTCPAY_HOST}
+        announce-addr=${BTCPAY_HOST}:9735
+        bind-addr=0.0.0.0:9735
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=btc
--- a/docker-compose-generator/docker-fragments/btcpayserver.yml
+++ b/docker-compose-generator/docker-fragments/btcpayserver.yml
@ -4,7 +4,7 @@ services:

  btcpayserver:
    restart: always
-    image: nicolasdorier/btcpayserver:1.0.2.6
+    image: nicolasdorier/btcpayserver:1.0.2.18
    expose:
      - "49392"
    environment:
@ -34,7 +34,7 @@ services:

  nbxplorer:
    restart: always
-    image: nicolasdorier/nbxplorer:1.0.2.3
+    image: nicolasdorier/nbxplorer:1.0.2.7
    expose: 
      - "32838"
    environment:
--- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml
+++ b/docker-compose-generator/docker-fragments/litecoin-clightning.yml
@ -2,15 +2,15 @@ version: "3"

 services:
  clightning_litecoin:
-    image: nicolasdorier/clightning:0.0.0.12
+    image: nicolasdorier/clightning:0.0.0.14
    container_name: btcpayserver_clightning_litecoin
    restart: always
    environment:
      LIGHTNINGD_OPT: |
        bitcoin-datadir=/etc/litecoin
        bitcoin-rpcconnect=litecoind
-        port=9736
-        ipaddr=${BTCPAY_HOST}:9736
+        bind-addr=0.0.0.0:9735
+        announce-addr=${BTCPAY_HOST}:9736
        network=${NBITCOIN_NETWORK:-regtest}
        alias=${LIGHTNING_ALIAS}
        chain=ltc
@ -18,7 +18,7 @@ services:
      - "clightning_litecoin_datadir:/root/.lightning"
      - "litecoin_datadir:/etc/litecoin"
    ports:
-      - "9736:9736"
+      - "9736:9735"
    links:
      - litecoind
  btcpayserver:
--- a/docker-compose-generator/src/Program.cs
+++ b/docker-compose-generator/src/Program.cs
@ -105,11 +105,16 @@ namespace DockerGenerator

 		private string FindLocation(string path)
 		{
+			string directory = path;
+			int i = 0;
 			while(true)
 			{
+				if(i > 10)
+					throw new DirectoryNotFoundException(directory);
 				if(Directory.Exists(path))
 					return path;
 				path = Path.Combine("..", path);
+				i++;
 			}
 		}
 	}
--- a/generate-docker-compose.ps1
+++ b/generate-docker-compose.ps1
@ -1 +1,4 @@
-cd .\docker-compose-generator;  dotnet run -p .\src\docker-compose-generator.csproj; cd ..;
+# This script will run docker-compose-generator in a container to generate the yml files
+
+docker build -t btcpayserver/docker-compose-generator "$(Get-Location)\docker-compose-generator"
+docker run -v "$(Get-Location)\Production:/app/Production" -v "$(Get-Location)\Production-NoReverseProxy:/app/Production-NoReverseProxy" --rm btcpayserver/docker-compose-generator
--- a/generate-docker-compose.sh
+++ b/generate-docker-compose.sh
@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This script will run docker-compose-generator in a container to generate the yml files
+docker build -t btcpayserver/docker-compose-generator "$(pwd)/docker-compose-generator"
+docker run -v "$(pwd)/Production:/app/Production" -v "$(pwd)/Production-NoReverseProxy:/app/Production-NoReverseProxy" --rm btcpayserver/docker-compose-generator