diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 9140c8680..1a7b1b3e8 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.1 - 1.0.3.68 + 1.0.3.69 NU1701,CA1816,CA1308,CA1810,CA2208 diff --git a/BTCPayServer/Configuration/BTCPayServerOptions.cs b/BTCPayServer/Configuration/BTCPayServerOptions.cs index 8451522db..81936205b 100644 --- a/BTCPayServer/Configuration/BTCPayServerOptions.cs +++ b/BTCPayServer/Configuration/BTCPayServerOptions.cs @@ -286,7 +286,6 @@ namespace BTCPayServer.Configuration private SSHSettings ParseSSHConfiguration(IConfiguration conf) { - var externalUrl = conf.GetOrDefault("externalurl", null); var settings = new SSHSettings(); settings.Server = conf.GetOrDefault("sshconnection", null); if (settings.Server != null) @@ -313,12 +312,6 @@ namespace BTCPayServer.Configuration settings.Username = "root"; } } - else if (externalUrl != null) - { - settings.Port = 22; - settings.Username = "root"; - settings.Server = externalUrl.DnsSafeHost; - } settings.Password = conf.GetOrDefault("sshpassword", ""); settings.KeyFile = conf.GetOrDefault("sshkeyfile", ""); settings.KeyFilePassword = conf.GetOrDefault("sshkeyfilepassword", ""); diff --git a/Dockerfile.linuxamd64 b/Dockerfile.linuxamd64 index 354475210..b786486a1 100644 --- a/Dockerfile.linuxamd64 +++ b/Dockerfile.linuxamd64 @@ -21,4 +21,4 @@ ENV BTCPAY_DATADIR=/datadir VOLUME /datadir COPY --from=builder "/app" . -ENTRYPOINT ["dotnet", "BTCPayServer.dll"] +ENTRYPOINT ["./docker-entrypoint.sh"] diff --git a/Dockerfile.linuxarm32v7 b/Dockerfile.linuxarm32v7 index d75db8099..c803d911b 100644 --- a/Dockerfile.linuxarm32v7 +++ b/Dockerfile.linuxarm32v7 @@ -18,4 +18,4 @@ ENV BTCPAY_DATADIR=/datadir VOLUME /datadir COPY --from=builder "/app" . -ENTRYPOINT ["dotnet", "BTCPayServer.dll"] +ENTRYPOINT ["./docker-entrypoint.sh"] diff --git a/btcpayserver.sln b/btcpayserver.sln index 1690414eb..c080973a6 100644 --- a/btcpayserver.sln +++ b/btcpayserver.sln @@ -10,6 +10,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{29290EC7-00E6-4C4B-96D9-4D7E9611DF28}" ProjectSection(SolutionItems) = preProject .circleci\config.yml = .circleci\config.yml + docker-entrypoint.sh = docker-entrypoint.sh Dockerfile.linuxamd64 = Dockerfile.linuxamd64 Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7 EndProjectSection diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 000000000..2d6717d40 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +echo "$(/sbin/ip route|awk '/default/ { print $3 }') host.docker.internal" >> /etc/hosts +exec dotnet BTCPayServer.dll