diff --git a/services/Archival/FilterLists.Archival.Api/Dockerfile b/services/Archival/FilterLists.Archival.Api/Dockerfile index 6cd10edbc..2e92e7cd6 100644 --- a/services/Archival/FilterLists.Archival.Api/Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/Dockerfile @@ -1,11 +1,12 @@ # init base -FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1.7-alpine AS base +# https://github.com/libgit2/libgit2sharp/issues/1703 +FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-bionic AS base LABEL org.opencontainers.image.description="filterlists.com | github.com/collinbarrett/filterlists | A .NET Core app archiving copies of FilterLists for mirrors and future analysis." WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API @@ -31,7 +32,7 @@ COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archiva COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api COPY Archival/FilterLists.Archival.Api/. . -RUN dotnet publish -c Release --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -p:DebugType=None -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-musl-x64 +RUN dotnet publish -c Release --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -p:DebugType=None -p:PublishReadyToRun=true -p:PublishSingleFile=true -p:PublishTrimmed=true -r linux-x64 # package final FROM base AS final diff --git a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj index fd24e3a37..7374ad7fe 100644 --- a/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj +++ b/services/Archival/FilterLists.Archival.Api/FilterLists.Archival.Api.csproj @@ -5,7 +5,7 @@ latest enable true - linux-musl-x64;win10-x64 + linux-x64;win10-x64 diff --git a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile index b77c0c782..d1725491a 100644 --- a/services/Archival/FilterLists.Archival.Api/dev.Dockerfile +++ b/services/Archival/FilterLists.Archival.Api/dev.Dockerfile @@ -1,10 +1,11 @@ # init base for Visual Studio debugging -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1.7-alpine AS base +# https://github.com/libgit2/libgit2sharp/issues/1703 +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-bionic AS base WORKDIR /app EXPOSE 80 # init build -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.401-alpine AS build +FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build ENV DOTNET_CLI_TELEMETRY_OPTOUT=true # restore API @@ -30,7 +31,7 @@ COPY Archival/FilterLists.Archival.Infrastructure/. Archival/FilterLists.Archiva COPY Archival/FilterLists.Archival.Application/. Archival/FilterLists.Archival.Application/ WORKDIR /app/Archival/FilterLists.Archival.Api COPY Archival/FilterLists.Archival.Api/. . -RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64 +RUN dotnet publish --no-restore -o /app/publish -r linux-x64 # package final FROM base AS final