diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index 429ed2761..182c2eec7 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -26,7 +26,7 @@
-
+
diff --git a/BTCPayServer/Build/DockerFile b/BTCPayServer/Build/DockerFile
index 58b0d5b05..cc2430700 100644
--- a/BTCPayServer/Build/DockerFile
+++ b/BTCPayServer/Build/DockerFile
@@ -1,8 +1,11 @@
-FROM microsoft/dotnet:2.0.0-sdk
+FROM microsoft/aspnetcore:2.0.0
-RUN mkdir /btcpayserver
-COPY "dockerfiles/" "/btcpayserver/"
+WORKDIR /app
+COPY "dockerfiles/" .
-ENTRYPOINT ["dotnet", "/btcpayserver/BTCPayServer.dll"]
-ENV POSTGRES="User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver"
-CMD ["--testnet", "--explorercookiefile=/.cookie", "--explorerurl=https://nbxplorer-testnet-public.azurewebsites.net/", "--bind=0.0.0.0"]
\ No newline at end of file
+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"]
diff --git a/BTCPayServer/Build/test.cmd b/BTCPayServer/Build/test.cmd
index 1d4f1f360..3ea7cd221 100644
--- a/BTCPayServer/Build/test.cmd
+++ b/BTCPayServer/Build/test.cmd
@@ -1,5 +1,6 @@
pushd .
cd ..
+dotnet restore
dotnet publish -c Release
popd
robocopy ..\bin\Release\netcoreapp2.0\publish\ dockerfiles /e
diff --git a/BTCPayServer/Configuration/DefaultConfiguration.cs b/BTCPayServer/Configuration/DefaultConfiguration.cs
index 53f362e8f..b041fbe40 100644
--- a/BTCPayServer/Configuration/DefaultConfiguration.cs
+++ b/BTCPayServer/Configuration/DefaultConfiguration.cs
@@ -34,6 +34,8 @@ namespace BTCPayServer.Configuration
return app;
}
+ public override string EnvironmentVariablePrefix => "BTCPAY_";
+
protected override string GetDefaultDataDir(IConfiguration conf)
{
return GetNetwork(conf).DefaultDataDirectory;
diff --git a/BTCPayServer/Controllers/AccountController.cs b/BTCPayServer/Controllers/AccountController.cs
index 4ffdb019b..176bc10ef 100644
--- a/BTCPayServer/Controllers/AccountController.cs
+++ b/BTCPayServer/Controllers/AccountController.cs
@@ -268,6 +268,7 @@ namespace BTCPayServer.Controllers
var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
RegisteredUserId = user.Id;
await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
+ _logger.LogInformation("User created a new account with password.");
if(!policies.RequiresConfirmedEmail)
{
await _signInManager.SignInAsync(user, isPersistent: false);
@@ -278,7 +279,6 @@ namespace BTCPayServer.Controllers
TempData["StatusMessage"] = "Account created, please confirm your email";
return View();
}
- _logger.LogInformation("User created a new account with password.");
}
AddErrors(result);
}