diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-02-16 15:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 15:54:16 -0500 |
| commit | 4b4399fba6df3368ab04e78acd2dd08873e4f07b (patch) | |
| tree | 647268715400ecc7550ddb100b285f44036c9677 | |
| parent | a15098dc0007c54ac30cf851043c9102b9c82104 (diff) | |
| parent | c06598635f2637dc60e022825e7a81bdae88a650 (diff) | |
Merge pull request #920 from nvllsvm/dockolate_icetainer
Fix cachedir missing from Docker container
| -rw-r--r-- | Dockerfile | 8 | ||||
| -rw-r--r-- | Dockerfile.arm | 8 | ||||
| -rw-r--r-- | Dockerfile.arm64 | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index 67505a57d..6c0d2515f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,11 @@ RUN apt-get update \ libfontconfig1 \ && apt-get clean autoclean \ && apt-get autoremove \ - && rm -rf /var/lib/{apt,dpkg,cache,log} + && rm -rf /var/lib/{apt,dpkg,cache,log} \ + && mkdir -p /cache /config /media \ + && chmod 777 /cache /config /media COPY --from=ffmpeg / / COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 -VOLUME /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config +VOLUME /cache /config /media +ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache diff --git a/Dockerfile.arm b/Dockerfile.arm index 802f45ff2..9d1c30619 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -27,8 +27,10 @@ RUN dotnet publish \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7 COPY --from=qemu_extract qemu-arm-static /usr/bin RUN apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg + && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \ + && mkdir -p /cache /config /media \ + && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 -VOLUME /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config +VOLUME /cache /config /media +ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 3175c950c..e61aaa167 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -28,8 +28,10 @@ RUN dotnet publish \ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8 COPY --from=qemu_extract qemu-aarch64-static /usr/bin RUN apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg + && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \ + && mkdir -p /cache /config /media \ + && chmod 777 /cache /config /media COPY --from=builder /jellyfin /jellyfin EXPOSE 8096 -VOLUME /config /media -ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config +VOLUME /cache /config /media +ENTRYPOINT dotnet /jellyfin/jellyfin.dll --datadir /config --cachedir /cache |