LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase to focal

Browse Source
This commit is contained in:
TheSpad 2022-06-19 20:11:43 +01:00
parent ea397b56b5
commit 3cdc4e7a9a
No known key found for this signature in database
GPG Key ID: 08F06191F4587860
5 changed files with 72 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Dockerfile
View File

@ -1,5 +1,5 @@
FROM lsiobase/ffmpeg:bin as binstage
FROM lsiobase/ubuntu:bionic
FROM ghcr.io/linuxserver/ffmpeg:bin as binstage
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
# Add files from binstage
COPY --from=binstage / /
@ -10,34 +10,36 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
ARG DEBIAN_FRONTEND="noninteractive"
# hardware env
ENV \
LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" \
NVIDIA_VISIBLE_DEVICES="all"
LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" \
NVIDIA_VISIBLE_DEVICES="all"
RUN \
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
i965-va-driver \
libexpat1 \
libgl1-mesa-dri \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxcb-shape0 \
libxcb-xfixes0 \
libxext6 \
libxml2 \
ocl-icd-libopencl1 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
i965-va-driver \
libexpat1 \
libgl1-mesa-dri \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxcb-shape0 \
libxcb-xfixes0 \
libxext6 \
libxml2 \
ocl-icd-libopencl1 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
COPY /root /

40
Dockerfile.aarch64
View File

@ -1,5 +1,5 @@
FROM lsiobase/ffmpeg:arm64v8-bin as binstage
FROM lsiobase/ubuntu:arm64v8-bionic
FROM ghcr.io/linuxserver/ffmpeg:arm64v8-bin as binstage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
# Add files from binstage
COPY --from=binstage / /
@ -10,24 +10,26 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
ARG DEBIAN_FRONTEND="noninteractive"
RUN \
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libexpat1 \
libfontconfig1 \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxext6 \
libxml2 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libexpat1 \
libfontconfig1 \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxext6 \
libxml2 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
COPY /root /

40
Dockerfile.armhf
View File

@ -1,5 +1,5 @@
FROM lsiobase/ffmpeg:arm32v7-bin as binstage
FROM lsiobase/ubuntu:arm32v7-bionic
FROM ghcr.io/linuxserver/ffmpeg:arm32v7-bin as binstage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic
# Add files from binstage
COPY --from=binstage / /
@ -10,24 +10,26 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
ARG DEBIAN_FRONTEND="noninteractive"
RUN \
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libexpat1 \
libfontconfig1 \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxext6 \
libxml2 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
echo "**** install runtime ****" && \
apt-get update && \
apt-get install -y \
libexpat1 \
libfontconfig1 \
libglib2.0-0 \
libgomp1 \
libharfbuzz0b \
libv4l-0 \
libx11-6 \
libxcb1 \
libxext6 \
libxml2 && \
echo "**** clean up ****" && \
rm -rf \
/var/lib/apt/lists/* \
/var/tmp/*
COPY /root /

1
README.md
View File

@ -127,6 +127,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **19.06.22:** - Rebase to Focal.
* **26.08.21:** - Add support for libOpenCL.
* **01.07.21:** - Bump to 4.4.
* **17.06.20:** - Bump to 4.3.

1
readme-vars.yml
View File

@ -130,6 +130,7 @@ full_custom_readme: |
## Versions
* **19.06.22:** - Rebase to Focal.
* **26.08.21:** - Add support for libOpenCL.
* **01.07.21:** - Bump to 4.4.
* **17.06.20:** - Bump to 4.3.