diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-12 15:54:52 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-12 15:54:52 +0100 |
| commit | ba671569b4a5f897c10b209d9e33fafca0e8621f (patch) | |
| tree | 42a60856f95e383ea502590336f4347661f7589f /deployment | |
| parent | 2c65fe53f264f120b5ed028cc81df629e0e6a3bc (diff) | |
Moved main docker file.
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/docker/Dockerfile.amd64 | 28 | ||||
| -rwxr-xr-x | deployment/docker/build.sh | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/deployment/docker/Dockerfile.amd64 b/deployment/docker/Dockerfile.amd64 deleted file mode 100644 index 62f8e4fa4..000000000 --- a/deployment/docker/Dockerfile.amd64 +++ /dev/null @@ -1,28 +0,0 @@ -ARG DOTNET_VERSION=2 - - -# Download ffmpeg first to allow quicker rebuild of other layers -FROM alpine as ffmpeg -ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz -RUN wget ${FFMPEG_URL} -O - | tar Jxf - \ - && mkdir ffmpeg-bin \ - && mv ffmpeg*/ffmpeg ffmpeg-bin \ - && mv ffmpeg*/ffprobe ffmpeg-bin - - -FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder -WORKDIR /repo -COPY . . -RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \ - && dotnet clean \ - && dotnet publish --configuration release --output /jellyfin Jellyfin.Server - - -FROM microsoft/dotnet:${DOTNET_VERSION}-runtime -COPY --from=builder /jellyfin /jellyfin -COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/ -EXPOSE 8096 -VOLUME /config /media -RUN apt-get update \ - && apt-get install -y libfontconfig1 --no-install-recommends # needed for Skia -ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh index 40cf90d28..783ebe1e3 100755 --- a/deployment/docker/build.sh +++ b/deployment/docker/build.sh @@ -4,7 +4,7 @@ source ../common.build.sh VERSION=`get_version ../..` -build_jellyfin_docker ../.. Dockerfile.amd64 jellyfin:amd64-${VERSION} +build_jellyfin_docker ../.. ../../Dockerfile jellyfin:amd64-${VERSION} build_jellyfin_docker ../.. Dockerfile.arm64v8 jellyfin:arm64v8-${VERSION} arm64v8 |