From ce24f046c0b46e112ca9bea82fe57ae104146919 Mon Sep 17 00:00:00 2001
From: NicolasDorier <nicolas.dorier@gmail.com>
Date: Thu, 28 Sep 2017 16:35:29 +0900
Subject: [PATCH] Update dockers files

---
 BTCPayServer/BTCPayServer.csproj        |  4 +++
 BTCPayServer/Build/docker-compose.yml   | 12 --------
 BTCPayServer/Build/test.cmd             |  7 -----
 BTCPayServer/{Build => }/DockerFile     |  4 +--
 BTCPayServer/docker-compose.regtest.yml | 38 +++++++++++++++++++++++++
 BTCPayServer/run-docker.cmd             |  3 ++
 6 files changed, 47 insertions(+), 21 deletions(-)
 delete mode 100644 BTCPayServer/Build/docker-compose.yml
 delete mode 100644 BTCPayServer/Build/test.cmd
 rename BTCPayServer/{Build => }/DockerFile (76%)
 create mode 100644 BTCPayServer/docker-compose.regtest.yml
 create mode 100644 BTCPayServer/run-docker.cmd

diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 182c2eec7..b1eae1110 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -95,4 +95,8 @@
 	  <None Include="wwwroot\vendor\scrollreveal\scrollreveal.js" />
 	  <None Include="wwwroot\vendor\scrollreveal\scrollreveal.min.js" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Folder Include="Build\" />
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/BTCPayServer/Build/docker-compose.yml b/BTCPayServer/Build/docker-compose.yml
deleted file mode 100644
index 99093c429..000000000
--- a/BTCPayServer/Build/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "3"
-
-services:
-  btcpayserver:
-    ports: 
-      - 23001:23001
-    build:
-      context: .
-      dockerfile: DockerFile
-  
-  postgres:
-    image:  postgres:9.6.5
diff --git a/BTCPayServer/Build/test.cmd b/BTCPayServer/Build/test.cmd
deleted file mode 100644
index 3ea7cd221..000000000
--- a/BTCPayServer/Build/test.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-pushd .
-cd ..
-dotnet restore
-dotnet publish -c Release
-popd
-robocopy ..\bin\Release\netcoreapp2.0\publish\ dockerfiles /e
-docker-compose up --force-recreate --build
\ No newline at end of file
diff --git a/BTCPayServer/Build/DockerFile b/BTCPayServer/DockerFile
similarity index 76%
rename from BTCPayServer/Build/DockerFile
rename to BTCPayServer/DockerFile
index cc2430700..ae8bd2ff4 100644
--- a/BTCPayServer/Build/DockerFile
+++ b/BTCPayServer/DockerFile
@@ -1,11 +1,11 @@
 FROM microsoft/aspnetcore:2.0.0
 
 WORKDIR /app
-COPY "dockerfiles/" .
+COPY "bin/Release/netcoreapp2.0/publish" .
 
 ENV BTCPAY_POSTGRES="User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver"
 ENV BTCPAY_NETWORK="testnet"
 ENV BTCPAY_EXPLORERURL="https://nbxplorer-testnet-public.azurewebsites.net/"
 ENV BTCPAY_BIND="0.0.0.0:80"
 
-ENTRYPOINT ["dotnet", "BTCPayServer.dll"]
+ENTRYPOINT ["dotnet", "BTCPayServer.dll"]
\ No newline at end of file
diff --git a/BTCPayServer/docker-compose.regtest.yml b/BTCPayServer/docker-compose.regtest.yml
new file mode 100644
index 000000000..472b87006
--- /dev/null
+++ b/BTCPayServer/docker-compose.regtest.yml
@@ -0,0 +1,38 @@
+version: "3"
+
+services:
+  nbxplorer:
+    image: nicolasdorier/nbxplorer
+    ports: 
+      - 23001:23001
+    environment:
+      NBXPLORER_NETWORK: regtest
+      NBXPLORER_RPCURL: http://bitcoind:49372/
+      NBXPLORER_RPCUSER: ceiwHEbqWI83
+      NBXPLORER_RPCPASSWORD: DwubwWsoo3
+      NBXPLORER_NODEENDPOINT: bitcoind:8332
+      NBXPLORER_NOAUTH: 1
+    links:
+      - bitcoind
+
+  bitcoind:
+    image: nicolasdorier/bitcoin:0.15.0.1
+    environment:
+      BITCOIN_EXTRA_ARGS: "regtest=1\nrpcport=49372\nport=8332"
+      BITCOIN_RPC_USER: ceiwHEbqWI83
+      BITCOIN_RPC_PASSWORD: DwubwWsoo3
+    expose:
+      - "49372"
+      - "8332"
+    ports:
+      - 49372:49372
+
+  btcpayserver:
+    ports: 
+      - 23001:23001
+    build:
+      context: .
+      dockerfile: DockerFile
+  
+  postgres:
+    image:  postgres:9.6.5
diff --git a/BTCPayServer/run-docker.cmd b/BTCPayServer/run-docker.cmd
new file mode 100644
index 000000000..7ee508d71
--- /dev/null
+++ b/BTCPayServer/run-docker.cmd
@@ -0,0 +1,3 @@
+dotnet restore
+dotnet publish -c Release
+docker-compose -f docker-compose.regtest.yml up --force-recreate --build
\ No newline at end of file