diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj index 9d04f16d0..b717e0bfc 100644 --- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj +++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1 @@ -8,7 +8,7 @@ - + diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile index 7f0fab553..9724bd446 100644 --- a/BTCPayServer.Tests/Dockerfile +++ b/BTCPayServer.Tests/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.300-rc1-sdk-alpine3.7 +FROM microsoft/dotnet:2.1.300-sdk-alpine3.7 WORKDIR /app # caches restore result by copying csproj file separately COPY BTCPayServer.Tests/BTCPayServer.Tests.csproj BTCPayServer.Tests/BTCPayServer.Tests.csproj diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 9f97dc2cf..8edf0c2e0 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -46,7 +46,7 @@ services: - lightning-charged nbxplorer: - image: nicolasdorier/nbxplorer:1.0.2.6 + image: nicolasdorier/nbxplorer:1.0.2.8 ports: - "32838:32838" expose: diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index bf7662173..ba2782c84 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -37,24 +37,24 @@ - + - - + + - - - - - + + + + + - - + + diff --git a/Dockerfile b/Dockerfile index 53107924e..66ed5b34b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1.300-rc1-sdk-alpine3.7 AS builder +FROM microsoft/dotnet:2.1.300-sdk-alpine3.7 AS builder WORKDIR /source COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj # Cache some dependencies @@ -6,7 +6,7 @@ RUN dotnet restore COPY BTCPayServer/. . RUN dotnet publish --output /app/ --configuration Release -FROM microsoft/dotnet:2.1.0-rc1-aspnetcore-runtime-alpine3.7 +FROM microsoft/dotnet:2.1.0-aspnetcore-runtime-alpine3.7 ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false RUN apk add --no-cache icu-libs