mirror of
https://github.com/collinbarrett/FilterLists.git
synced 2026-03-11 09:04:27 +00:00
chore(svcs): 📦 bump images to net6.0
This commit is contained in:
parent
9282043104
commit
b7daf53cec
6 changed files with 12 additions and 12 deletions
|
|
@ -1,11 +1,11 @@
|
|||
# init base
|
||||
FROM mcr.microsoft.com/dotnet/runtime-deps:5.0-alpine3.12 AS base
|
||||
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine AS base
|
||||
LABEL org.opencontainers.image.description="filterlists.com | github.com/collinbarrett/filterlists | An ASP.NET Core API archiving and serving copies of FilterLists for mirrors and analysis."
|
||||
WORKDIR /app
|
||||
EXPOSE 80
|
||||
|
||||
# init build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine3.12 AS build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
|
||||
ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
|
||||
|
||||
# restore API
|
||||
|
|
@ -29,7 +29,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 -p:DebugType=None --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -r alpine.3.12-x64 --self-contained true -p:PublishSingleFile=true -p:PublishTrimmed=True -p:PublishReadyToRun=true
|
||||
RUN dotnet publish -c Release -p:DebugType=None --no-restore -o /app/publish -p:TreatWarningsAsErrors=true -r linux-musl-x64 --self-contained true -p:PublishSingleFile=true -p:PublishTrimmed=True -p:PublishReadyToRun=true
|
||||
|
||||
# package final
|
||||
FROM base AS final
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<Nullable>enable</Nullable>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<PublishReadyToRunShowWarnings>true</PublishReadyToRunShowWarnings>
|
||||
<RuntimeIdentifiers>alpine.3.12-x64;win10-x64</RuntimeIdentifiers>
|
||||
<RuntimeIdentifiers>linux-musl-x64;win10-x64</RuntimeIdentifiers>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# init base for Visual Studio debugging
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine3.12 AS base
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
|
||||
WORKDIR /app
|
||||
|
||||
# init build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine3.12 AS build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
|
||||
ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
|
||||
|
||||
# restore API
|
||||
|
|
@ -27,7 +27,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 alpine.3.12-x64
|
||||
RUN dotnet publish --no-restore -o /app/publish -r linux-musl-x64
|
||||
|
||||
# package final
|
||||
FROM base AS final
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
# init base
|
||||
FROM mcr.microsoft.com/dotnet/runtime-deps:5.0-alpine AS base
|
||||
FROM mcr.microsoft.com/dotnet/runtime-deps:6.0-alpine AS base
|
||||
LABEL org.opencontainers.image.description="filterlists.com | github.com/collinbarrett/filterlists | An ASP.NET Core API serving the core FilterList information."
|
||||
WORKDIR /app
|
||||
EXPOSE 80
|
||||
|
||||
# init build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
|
||||
ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
|
||||
|
||||
# restore API
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# init base for Visual Studio debugging
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine AS base
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine AS base
|
||||
WORKDIR /app
|
||||
EXPOSE 80
|
||||
|
||||
# init build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS build
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS build
|
||||
ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
|
||||
|
||||
# restore API
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# init test-migrations
|
||||
FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine AS test-migrations
|
||||
FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine AS test-migrations
|
||||
ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
|
||||
ENTRYPOINT ["dotnet", "test", "--logger:trx"]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue