Merge pull request #4497 from crobibero/docker-pls

Fix docker and centos builds
pull/4500/head
Joshua M. Boniface 4 years ago committed by GitHub
commit 47bfbb1377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,6 +1,6 @@
ARG DOTNET_VERSION=5.0 ARG DOTNET_VERSION=5.0
FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster-slim FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-buster-slim
ARG SOURCE_DIR=/src ARG SOURCE_DIR=/src
ARG ARTIFACT_DIR=/jellyfin ARG ARTIFACT_DIR=/jellyfin

@ -1,6 +1,6 @@
ARG DOTNET_VERSION=5.0 ARG DOTNET_VERSION=5.0
FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster-slim FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-buster-slim
ARG SOURCE_DIR=/src ARG SOURCE_DIR=/src
ARG ARTIFACT_DIR=/jellyfin ARG ARTIFACT_DIR=/jellyfin

@ -1,6 +1,6 @@
ARG DOTNET_VERSION=5.0 ARG DOTNET_VERSION=5.0
FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster-slim FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-buster-slim
ARG SOURCE_DIR=/src ARG SOURCE_DIR=/src
ARG ARTIFACT_DIR=/jellyfin ARG ARTIFACT_DIR=/jellyfin

@ -82,7 +82,6 @@ EOF
%{_libdir}/jellyfin/* %{_libdir}/jellyfin/*
# Needs 755 else only root can run it since binary build by dotnet is 722 # Needs 755 else only root can run it since binary build by dotnet is 722
%attr(755,root,root) %{_libdir}/jellyfin/jellyfin %attr(755,root,root) %{_libdir}/jellyfin/jellyfin
%{_libdir}/jellyfin/SOS_README.md
%{_unitdir}/jellyfin.service %{_unitdir}/jellyfin.service
%{_libexecdir}/jellyfin/restart.sh %{_libexecdir}/jellyfin/restart.sh
%{_prefix}/lib/firewalld/services/jellyfin.xml %{_prefix}/lib/firewalld/services/jellyfin.xml

Loading…
Cancel
Save