From 99b1dc1421058d5eb4ddee5092c7b4a1d4f06112 Mon Sep 17 00:00:00 2001 From: Deluan Date: Tue, 28 Jan 2020 15:01:23 -0500 Subject: [PATCH] feat: upgrade ffmpeg in docker image --- Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1168e390b..3535e5171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,7 @@ RUN apk add -U --no-cache build-base git RUN go get -u github.com/go-bindata/go-bindata/... # Download and unpack static ffmpeg -ARG FFMPEG_VERSION=4.1.4 -ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-${FFMPEG_VERSION}-amd64-static.tar.xz +ARG FFMPEG_URL=https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz RUN wget -O /tmp/ffmpeg.tar.xz ${FFMPEG_URL} RUN cd /tmp && tar xJf ffmpeg.tar.xz && rm ffmpeg.tar.xz @@ -41,17 +40,23 @@ RUN GIT_SHA=$(git rev-parse --short HEAD) && \ ##################################################### ### Build Final Image -FROM alpine +FROM alpine as release +MAINTAINER Deluan Quintao + COPY --from=gobuilder /src/navidrome /app/ COPY --from=gobuilder /tmp/ffmpeg*/ffmpeg /usr/bin/ +# Check if ffmpeg runs properly +RUN ffmpeg -buildconf + VOLUME ["/data", "/music"] ENV ND_MUSICFOLDER /music ENV ND_DATAFOLDER /data ENV ND_SCANINTERVAL 1m ENV ND_LOGLEVEL info ENV ND_PORT 4533 -EXPOSE 4533 +EXPOSE 4533 WORKDIR /app -CMD "/app/navidrome" + +ENTRYPOINT "/app/navidrome"