fix default dockerfile (#1156)
This commit is contained in:
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
|
||||
## [Unreleased]
|
||||
### Fixed
|
||||
- Align default docker image (no acceleration) with new images from [ErsatzTV-ffmpeg](https://github.com/jasongdove/ErsatzTV-ffmpeg)
|
||||
|
||||
## [0.7.4-beta] - 2023-02-12
|
||||
### Added
|
||||
|
||||
+3
-9
@@ -1,10 +1,4 @@
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-amd64 AS dotnet-runtime
|
||||
|
||||
FROM jasongdove/ffmpeg:5.1-ubuntu2004 AS runtime-base
|
||||
COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
|
||||
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata fontconfig fonts-dejavu libgdiplus
|
||||
|
||||
# https://hub.docker.com/_/microsoft-dotnet
|
||||
# https://hub.docker.com/_/microsoft-dotnet
|
||||
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
|
||||
RUN apt-get update && apt-get install -y ca-certificates
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
|
||||
@@ -32,15 +26,15 @@ COPY ErsatzTV.Core/. ./ErsatzTV.Core/
|
||||
COPY ErsatzTV.FFmpeg/. ./ErsatzTV.FFmpeg/
|
||||
COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/
|
||||
COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/
|
||||
WORKDIR /source/ErsatzTV.Scanner
|
||||
ARG INFO_VERSION="unknown"
|
||||
WORKDIR /source/ErsatzTV.Scanner
|
||||
RUN dotnet publish ErsatzTV.Scanner.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
|
||||
WORKDIR /source/ErsatzTV
|
||||
RUN sed -i '/Scanner/d' ErsatzTV.csproj
|
||||
RUN dotnet publish ErsatzTV.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
|
||||
|
||||
# final stage/image
|
||||
FROM runtime-base
|
||||
FROM jasongdove/ersatztv-ffmpeg:5.1.2 AS runtime-base
|
||||
ENV FONTCONFIG_PATH=/etc/fonts
|
||||
RUN fc-cache update
|
||||
WORKDIR /app
|
||||
|
||||
Reference in New Issue
Block a user