mirror of
https://github.com/linuxserver/docker-ffmpeg.git
synced 2026-02-20 04:56:23 +08:00
Merge pull request #17 from linuxserver/master-focal
This commit is contained in:
Adam
GitHub
commit
cb67a236d8
54
Dockerfile
54
Dockerfile
@ -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 /
|
||||
|
||||
|
||||
@ -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 /
|
||||
|
||||
|
||||
@ -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 /
|
||||
|
||||
|
||||
43
README.md
43
README.md
@ -3,12 +3,12 @@
|
||||
|
||||
[](https://linuxserver.io)
|
||||
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](https://github.com/linuxserver "view the source for all of our repositories.")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
|
||||
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
|
||||
|
||||
@ -26,13 +26,15 @@ Find us at:
|
||||
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
|
||||
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
|
||||
|
||||
# [linuxserver/ffmpeg](https://github.com/linuxserver/docker-ffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/releases)
|
||||
[](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com")
|
||||
[](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com")
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/)
|
||||
[](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/releases)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/packages)
|
||||
[](https://gitlab.com/linuxserver.io/docker-ffmpeg/container_registry)
|
||||
[](https://quay.io/repository/linuxserver.io/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/)
|
||||
|
||||
[FFmpeg](https://ffmpeg.org) - A complete, cross-platform solution to record, convert and stream audio and video.
|
||||
|
||||
@ -41,17 +43,17 @@ Find us at:
|
||||
|
||||
## Supported Architectures
|
||||
|
||||
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||
|
||||
Simply pulling `linuxserver/ffmpeg` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||
Simply pulling `lscr.io/linuxserver/ffmpeg:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||
|
||||
The architectures supported by this image are:
|
||||
|
||||
| Architecture | Tag |
|
||||
| :----: | --- |
|
||||
| x86-64 | amd64-latest |
|
||||
| arm64 | arm64v8-latest |
|
||||
| armhf | arm32v7-latest |
|
||||
| Architecture | Available | Tag |
|
||||
| :----: | :----: | ---- |
|
||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||
| armhf| ✅ | arm32v7-\<version tag\> |
|
||||
|
||||
## Usage
|
||||
|
||||
@ -127,6 +129,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.
|
||||
|
||||
@ -5,13 +5,13 @@ project_name: ffmpeg
|
||||
full_custom_readme: |
|
||||
{% raw -%}
|
||||
[](https://linuxserver.io)
|
||||
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
|
||||
[](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
|
||||
[](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
|
||||
[](https://discourse.linuxserver.io "post on our community forum.")
|
||||
[](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
|
||||
[](https://github.com/linuxserver "view the source for all of our repositories.")
|
||||
[](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
|
||||
|
||||
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
|
||||
|
||||
@ -29,13 +29,15 @@ full_custom_readme: |
|
||||
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
|
||||
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
|
||||
|
||||
# [linuxserver/ffmpeg](https://github.com/linuxserver/docker-ffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/releases)
|
||||
[](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com")
|
||||
[](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com")
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/)
|
||||
[](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/releases)
|
||||
[](https://github.com/linuxserver/docker-ffmpeg/packages)
|
||||
[](https://gitlab.com/linuxserver.io/docker-ffmpeg/container_registry)
|
||||
[](https://quay.io/repository/linuxserver.io/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://hub.docker.com/r/linuxserver/ffmpeg)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/)
|
||||
|
||||
[FFmpeg](https://ffmpeg.org) - A complete, cross-platform solution to record, convert and stream audio and video.
|
||||
|
||||
@ -43,18 +45,18 @@ full_custom_readme: |
|
||||
[](https://ffmpeg.org)
|
||||
|
||||
## Supported Architectures
|
||||
|
||||
Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||
|
||||
Simply pulling `linuxserver/ffmpeg` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||
|
||||
|
||||
We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
|
||||
|
||||
Simply pulling `lscr.io/linuxserver/ffmpeg:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
|
||||
|
||||
The architectures supported by this image are:
|
||||
|
||||
| Architecture | Tag |
|
||||
| :----: | --- |
|
||||
| x86-64 | amd64-latest |
|
||||
| arm64 | arm64v8-latest |
|
||||
| armhf | arm32v7-latest |
|
||||
| Architecture | Available | Tag |
|
||||
| :----: | :----: | ---- |
|
||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||
| armhf| ✅ | arm32v7-\<version tag\> |
|
||||
|
||||
## Usage
|
||||
|
||||
@ -130,6 +132,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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user