From ce1903b2fa34a0ce9968af2d4dc6124903e0acf2 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 5 Oct 2021 15:26:40 +0900 Subject: [PATCH] Bumping versions of libraries and dockerfile --- .../BTCPayServer.Abstractions.csproj | 8 ++++---- BTCPayServer.Data/BTCPayServer.Data.csproj | 4 ++-- .../BTCPayServer.Plugins.Test.csproj | 2 +- BTCPayServer.Rating/BTCPayServer.Rating.csproj | 2 +- BTCPayServer.Tests/Dockerfile | 2 +- BTCPayServer/BTCPayServer.csproj | 2 +- amd64.Dockerfile | 4 ++-- arm32v7.Dockerfile | 4 ++-- arm64v8.Dockerfile | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj index 0b0acb8fc..ea739a365 100644 --- a/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj +++ b/BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj @@ -31,10 +31,10 @@ - - - - + + + + diff --git a/BTCPayServer.Data/BTCPayServer.Data.csproj b/BTCPayServer.Data/BTCPayServer.Data.csproj index 479d9db9d..2eeba7c8f 100644 --- a/BTCPayServer.Data/BTCPayServer.Data.csproj +++ b/BTCPayServer.Data/BTCPayServer.Data.csproj @@ -3,11 +3,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj b/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj index aa263c9a7..152ecc653 100644 --- a/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj +++ b/BTCPayServer.Plugins.Test/BTCPayServer.Plugins.Test.csproj @@ -13,7 +13,7 @@ - + diff --git a/BTCPayServer.Rating/BTCPayServer.Rating.csproj b/BTCPayServer.Rating/BTCPayServer.Rating.csproj index 9795f51bb..836975c6f 100644 --- a/BTCPayServer.Rating/BTCPayServer.Rating.csproj +++ b/BTCPayServer.Rating/BTCPayServer.Rating.csproj @@ -4,7 +4,7 @@ - + diff --git a/BTCPayServer.Tests/Dockerfile b/BTCPayServer.Tests/Dockerfile index 436a25906..46ac6ada6 100644 --- a/BTCPayServer.Tests/Dockerfile +++ b/BTCPayServer.Tests/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413 AS builder RUN apt-get update && apt-get install -y --no-install-recommends chromium-driver \ && rm -rf /var/lib/apt/lists/* diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index 02bb5a1d0..9816dee7d 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -61,7 +61,7 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/amd64.Dockerfile b/amd64.Dockerfile index 3a62ad9f9..401bc2b0e 100644 --- a/amd64.Dockerfile +++ b/amd64.Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 WORKDIR /source COPY nuget.config nuget.config @@ -20,7 +20,7 @@ COPY Build/Version.csproj Build/Version.csproj ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4-buster-slim +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/* diff --git a/arm32v7.Dockerfile b/arm32v7.Dockerfile index 7deb09628..0fec4c54e 100644 --- a/arm32v7.Dockerfile +++ b/arm32v7.Dockerfile @@ -1,5 +1,5 @@ # This is a manifest image, will pull the image with the same arch as the builder machine -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN apt-get update \ && apt-get install -qq --no-install-recommends qemu qemu-user-static qemu-user binfmt-support @@ -25,7 +25,7 @@ ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4-buster-slim-arm32v7 +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim-arm32v7 COPY --from=builder /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/* diff --git a/arm64v8.Dockerfile b/arm64v8.Dockerfile index fd614e0fe..94e0ee5d4 100644 --- a/arm64v8.Dockerfile +++ b/arm64v8.Dockerfile @@ -1,5 +1,5 @@ # This is a manifest image, will pull the image with the same arch as the builder machine -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.413-bullseye AS builder ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 ENV LC_ALL en_US.UTF-8 RUN apt-get update \ @@ -26,7 +26,7 @@ ARG CONFIGURATION_NAME=Release RUN cd BTCPayServer && dotnet publish --output /app/ --configuration ${CONFIGURATION_NAME} # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.4-buster-slim-arm64v8 +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.19-bullseye-slim-arm64v8 COPY --from=builder /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \ && rm -rf /var/lib/apt/lists/*