diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-10-25 12:26:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 12:26:18 -0400 |
| commit | 873225a7f251692e1a8a18d7722bd4d83ae59e21 (patch) | |
| tree | 414836f9d547f19b151aabbfa5be18544f68af85 /Dockerfile | |
| parent | 0add74240fbb3e2d65d3b56fd90612c63e8690cf (diff) | |
| parent | f1167ace7e510c459341ab60337edc5385bcdc92 (diff) | |
Merge pull request #1922 from Bond-009/docker
Use the correct dotnet runtime in Docker images
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index e2e23da7f6..afa8152ff9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none" FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg +FROM debian:stretch-slim -FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION} COPY --from=ffmpeg /opt/ffmpeg /opt/ffmpeg COPY --from=builder /jellyfin /jellyfin COPY --from=web-builder /dist /jellyfin/jellyfin-web @@ -38,9 +38,11 @@ RUN apt-get update \ && ln -s /opt/ffmpeg/bin/ffmpeg /usr/local/bin \ && ln -s /opt/ffmpeg/bin/ffprobe /usr/local/bin +ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + EXPOSE 8096 VOLUME /cache /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll \ +ENTRYPOINT ./jellyfin/jellyfin \ --datadir /config \ --cachedir /cache \ --ffmpeg /usr/local/bin/ffmpeg |