From c8fcb0ab185658cf6f3d92cffb855cfe91fc0259 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Fri, 23 Nov 2018 16:14:13 +0900 Subject: [PATCH] Use framework dependent build for ARM --- Dockerfile.linuxamd64 | 1 - Dockerfile.linuxarm32v7 | 16 +++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile.linuxamd64 b/Dockerfile.linuxamd64 index 9bbfcadce..354475210 100644 --- a/Dockerfile.linuxamd64 +++ b/Dockerfile.linuxamd64 @@ -1,7 +1,6 @@ FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 AS builder WORKDIR /source COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj -# Cache some dependencies RUN dotnet restore COPY BTCPayServer/. . RUN dotnet publish --output /app/ --configuration Release diff --git a/Dockerfile.linuxarm32v7 b/Dockerfile.linuxarm32v7 index 55b59571f..d75db8099 100644 --- a/Dockerfile.linuxarm32v7 +++ b/Dockerfile.linuxarm32v7 @@ -1,19 +1,13 @@ -## This is a manifest image, will pull the image with the same arch as the host +# This is a manifest image, will pull the image with the same arch as the builder machine FROM microsoft/dotnet:2.1.500-sdk AS builder -RUN dotnet --info WORKDIR /source COPY BTCPayServer/BTCPayServer.csproj BTCPayServer.csproj -# Cache some dependencies -RUN dotnet restore -r linux-arm - +RUN dotnet restore COPY BTCPayServer/. . -RUN dotnet publish -c Release -r linux-arm -o /app/ /p:ShowLinkerSizeComparison=true +RUN dotnet publish --output /app/ --configuration Release - -## We force the host to use an ARM image. This is fine also on x64 as long as the builder does not call any program -FROM microsoft/dotnet:2.1.6-aspnetcore-runtime-stretch-slim-arm32v7 AS runtime - -ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false +# 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 microsoft/dotnet:2.1.6-aspnetcore-runtime-stretch-slim-arm32v7 ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8