diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2020-11-16 19:44:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 19:44:49 -0500 |
| commit | 47bfbb1377baad6544061c04e6f45cf5ec231b9e (patch) | |
| tree | 84ae4cf9f5142b697d8164090562f027787f754e | |
| parent | 7b42b7e8bd40ef7bd6bb6a533cb3c9dfcd00c63f (diff) | |
| parent | be3c65d80f4b2972a2e1a60ed3894102c0ee9cb8 (diff) | |
Merge pull request #4497 from crobibero/docker-pls
Fix docker and centos builds
| -rw-r--r-- | deployment/Dockerfile.docker.amd64 | 2 | ||||
| -rw-r--r-- | deployment/Dockerfile.docker.arm64 | 2 | ||||
| -rw-r--r-- | deployment/Dockerfile.docker.armhf | 2 | ||||
| -rw-r--r-- | fedora/jellyfin.spec | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/deployment/Dockerfile.docker.amd64 b/deployment/Dockerfile.docker.amd64 index e1787acad..0b1a57014 100644 --- a/deployment/Dockerfile.docker.amd64 +++ b/deployment/Dockerfile.docker.amd64 @@ -1,6 +1,6 @@ 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 ARTIFACT_DIR=/jellyfin diff --git a/deployment/Dockerfile.docker.arm64 b/deployment/Dockerfile.docker.arm64 index 08240111a..583f53ca0 100644 --- a/deployment/Dockerfile.docker.arm64 +++ b/deployment/Dockerfile.docker.arm64 @@ -1,6 +1,6 @@ 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 ARTIFACT_DIR=/jellyfin diff --git a/deployment/Dockerfile.docker.armhf b/deployment/Dockerfile.docker.armhf index 68c7b7d65..177c11713 100644 --- a/deployment/Dockerfile.docker.armhf +++ b/deployment/Dockerfile.docker.armhf @@ -1,6 +1,6 @@ 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 ARTIFACT_DIR=/jellyfin diff --git a/fedora/jellyfin.spec b/fedora/jellyfin.spec index 22f5949ae..13305488e 100644 --- a/fedora/jellyfin.spec +++ b/fedora/jellyfin.spec @@ -82,7 +82,6 @@ EOF %{_libdir}/jellyfin/* # Needs 755 else only root can run it since binary build by dotnet is 722 %attr(755,root,root) %{_libdir}/jellyfin/jellyfin -%{_libdir}/jellyfin/SOS_README.md %{_unitdir}/jellyfin.service %{_libexecdir}/jellyfin/restart.sh %{_prefix}/lib/firewalld/services/jellyfin.xml |