Migration to new deployment system

docker-compose-generator/.dockerignore

@@ -122,3 +122,4 @@ output
 
 .vs
 **/launchSettings.json
+docker-fragments/

docker-compose-generator/Dockerfile

@@ -16,6 +16,5 @@ VOLUME /datadir
 ENV INSIDE_CONTAINER=1
 
 COPY --from=builder "/app" .
-COPY docker-fragments docker-fragments
 
 ENTRYPOINT ["dotnet", "docker-compose-generator.dll"]

docker-compose-generator/docker-fragments/bgold.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   bgoldd:
-      restart: always
+      restart: unless-stopped
       container_name: btcpayserver_bgoldd
       image: kamigawabul/docker-bitcoingold:0.15.0.2
       environment:

docker-compose-generator/docker-fragments/bitcoin-clightning.yml

@@ -4,7 +4,7 @@ services:
   clightning_bitcoin:
     image: nicolasdorier/clightning:0.0.0.16
     container_name: btcpayserver_clightning_bitcoin
-    restart: always
+    restart: unless-stopped
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/bitcoin

docker-compose-generator/docker-fragments/bitcoin.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   bitcoind:
-      restart: always
+      restart: unless-stopped
       container_name: btcpayserver_bitcoind
       image: nicolasdorier/docker-bitcoin:0.16.0
       environment:

docker-compose-generator/docker-fragments/btcpayserver.yml

@@ -3,7 +3,7 @@ version: "3"
 services:
 
   btcpayserver:
-    restart: always
+    restart: unless-stopped
     image: nicolasdorier/btcpayserver:1.0.2.21
     expose:
       - "49392"
@@ -33,7 +33,7 @@ services:
      - "nbxplorer_datadir:/root/.nbxplorer"
 
   nbxplorer:
-    restart: always
+    restart: unless-stopped
     image: nicolasdorier/nbxplorer:1.0.2.7
     expose: 
       - "32838"
@@ -44,7 +44,7 @@ services:
       - "nbxplorer_datadir:/datadir"
 
   postgres:
-    restart: always
+    restart: unless-stopped
     image:  postgres:9.6.5
     volumes:
       - "postgres_datadir:/var/lib/postgresql/data"

docker-compose-generator/docker-fragments/litecoin-clightning.yml

@@ -4,7 +4,7 @@ services:
   clightning_litecoin:
     image: nicolasdorier/clightning:0.0.0.16
     container_name: btcpayserver_clightning_litecoin
-    restart: always
+    restart: unless-stopped
     environment:
       LIGHTNINGD_OPT: |
         bitcoin-datadir=/etc/litecoin

docker-compose-generator/docker-fragments/litecoin.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   litecoind:
-    restart: always
+    restart: unless-stopped
     container_name: btcpayserver_litecoind
     image: nicolasdorier/docker-litecoin:0.15.1
     environment:

docker-compose-generator/docker-fragments/nginx.yml

@@ -2,7 +2,7 @@ version: "3"
 
 services:
   nginx:
-    restart: always
+    restart: unless-stopped
     image: nginx
     container_name: nginx
     ports:
@@ -17,7 +17,7 @@ services:
       - btcpayserver
 
   nginx-gen:
-    restart: always
+    restart: unless-stopped
     image: jwilder/docker-gen
     container_name: nginx-gen
     volumes:
@@ -32,7 +32,7 @@ services:
       - nginx
 
   letsencrypt-nginx-proxy-companion:
-    restart: always
+    restart: unless-stopped
     image: jrcs/letsencrypt-nginx-proxy-companion
     container_name: letsencrypt-nginx-proxy-companion
     volumes:

docker-compose-generator/src/docker-compose-generator.csproj

@@ -2,14 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>netcoreapp2.1</TargetFramework>
 	<RootNamespace>DockerGenerator</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />
-	  <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.2" />
-	  <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.13" />
 	  <PackageReference Include="YamlDotNet" Version="4.3.1" />
   </ItemGroup>