Merge remote-tracking branch 'upstream/master'

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

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"]

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

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:

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:

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++;
 			}
 		}
 	}