Skip to content

Commit

Permalink
chore(alpine): Add static-ffmpeg 6.1.1 to alpine Docker image
Browse files Browse the repository at this point in the history
Signed-off-by: 陳鈞 <[email protected]>
  • Loading branch information
jim60105 committed Jan 8, 2024
1 parent 16a99c4 commit d25db75
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ RUN apk add -u --no-cache \
# Use dumb-init to handle signals
dumb-init

# ffmpeg (6.1 is broken, so override it)
COPY --link --from=mwader/static-ffmpeg:6.1.1 /ffmpeg /usr/bin/
COPY --link --from=mwader/static-ffmpeg:6.1.1 /ffprobe /usr/bin/

# Create user
RUN addgroup -g $UID $UID && \
adduser -H -g "" -D $UID -u $UID -G $UID
Expand Down
6 changes: 5 additions & 1 deletion alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@ RUN pip3.12 uninstall -y setuptools pip wheel && \
rm -rf /root/.cache/pip

# Use dumb-init to handle signals
RUN apk add -u --no-cache dumb-init ffmpeg
RUN apk add -u --no-cache dumb-init

# ffmpeg (6.1 is broken, so override it)
COPY --link --from=mwader/static-ffmpeg:6.1.1 /ffmpeg /usr/bin/
COPY --link --from=mwader/static-ffmpeg:6.1.1 /ffprobe /usr/bin/

# Create user
RUN addgroup -g $UID $UID && \
Expand Down

0 comments on commit d25db75

Please sign in to comment.