Skip to content
This repository has been archived by the owner on Jun 5, 2024. It is now read-only.

Commit

Permalink
Get ffmpeg from new source
Browse files Browse the repository at this point in the history
  • Loading branch information
wanjohiryan committed Jun 24, 2023
1 parent e89e73d commit 43613ac
Showing 1 changed file with 2 additions and 22 deletions.
24 changes: 2 additions & 22 deletions docker/nvidia/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#! Some code was copied or inspired by https://github.com/ehfd/nvidia-dind/blob/main/Dockerfile
# Which is licensed under MPL-2.0 license
# Thanks ehfd :)
ARG UBUNTU_RELEASE=22.04
FROM ghcr.io/linuxserver/ffmpeg:amd64-latest as ffmpeg

FROM ubuntu:${UBUNTU_RELEASE}
FROM ghcr.io/wanjohiryan/ffmpeg/v6:nightly

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -51,24 +48,6 @@ RUN chmod +x /root/download_gecko_and_mono.sh \
RUN wget -nv -O /usr/bin/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
&& chmod +x /usr/bin/winetricks

#
#Install ffmpeg5
RUN mkdir -p etc/OpenCL/vendors
COPY --from=ffmpeg /usr/local /usr/local/
COPY --from=ffmpeg /etc/OpenCL/vendors/nvidia.icd /etc/OpenCL/vendors/

RUN apt-get update; \
apt-get install -y \
libexpat1 libglib2.0-0 libgomp1 libharfbuzz0b libv4l-0 \
libwayland-client0 libx11-6 libx11-xcb1 libxcb1 libxcb-dri3-0 \
libxcb-shape0 libxcb-xfixes0 libxext6 libxfixes3 libxml2 ocl-icd-libopencl1; \
#
#clean up
rm -rf /var/lib/apt/lists/* /var/tmp/*

#check the installed version
RUN ffmpeg -version;

#
# NVIDIA Container Toolkit & Docker
RUN distribution=$(. /etc/os-release;echo $ID$VERSION_ID); \
Expand Down Expand Up @@ -98,6 +77,7 @@ RUN groupadd --gid ${USER_GID} ${USERNAME}; \
COPY docker/nvidia/modprobe docker/nvidia/entrypoint.sh docker/nvidia/dockerd.sh /usr/local/bin/
COPY docker/nvidia/logger.sh /opt/bash-utils/logger.sh
COPY ./arc3dia /usr/local/bin/

#
#Add execution permissions
RUN chmod +x /usr/local/bin/entrypoint.sh /usr/local/bin/dockerd.sh /usr/local/bin/modprobe /usr/local/bin/arc3dia
Expand Down

0 comments on commit 43613ac

Please sign in to comment.