From 3cdc4e7a9a60f5f43558d8179a206c3658f646e4 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 19 Jun 2022 20:11:43 +0100 Subject: [PATCH 1/2] Rebase to focal --- Dockerfile | 54 ++++++++++++++++++++++++---------------------- Dockerfile.aarch64 | 40 ++++++++++++++++++---------------- Dockerfile.armhf | 40 ++++++++++++++++++---------------- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 72 insertions(+), 64 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba3f39b..904afc5 100644 --- a/Dockerfile +++ b/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 / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8e8020c..307e7e7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 2ef8d2d..55e633d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 / diff --git a/README.md b/README.md index 0411d4e..35685a0 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/readme-vars.yml b/readme-vars.yml index 3bc3a18..bef8b9f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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. From 8c4474487c8c1626f04cf6d66d389a71ea5b6101 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 19 Jun 2022 20:48:33 +0100 Subject: [PATCH 2/2] Update readme to new style --- README.md | 42 +++++++++++++++++++++-------------------- readme-vars.yml | 50 +++++++++++++++++++++++++------------------------ 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 35685a0..8fb9106 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") -[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") -[![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") +[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") +[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") +[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](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) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-ffmpeg/releases) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com") -[![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/ffmpeg) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/ffmpeg) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-ffmpeg/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-ffmpeg/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/ffmpeg) +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-ffmpeg%2Fjob%2Fmaster%2F&logo=jenkins)](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-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Usage diff --git a/readme-vars.yml b/readme-vars.yml index bef8b9f..e054a0d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -5,13 +5,13 @@ project_name: ffmpeg full_custom_readme: | {% raw -%} [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) - - [![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") - [![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") - [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") - [![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") - [![Podcast](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Podcast)](https://anchor.fm/linuxserverio "on hiatus. Coming back soon (late 2018).") - [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Open%20Collective%20Supporters)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") + + [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") + [![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") + [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") + [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") + [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") + [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](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) - [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?style=flat-square&color=E68523)](https://github.com/linuxserver/docker-ffmpeg/releases) - [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com") - [![MicroBadger Size](https://img.shields.io/microbadger/image-size/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/ffmpeg "Get your own version badge on microbadger.com") - [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/ffmpeg) - [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/ffmpeg.svg?style=flat-square&color=E68523)](https://hub.docker.com/r/linuxserver/ffmpeg) - [![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-ffmpeg/job/master/) + [![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fffmpeg?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fffmpeg) + [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg) + [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-ffmpeg/releases) + [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-ffmpeg/packages) + [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-ffmpeg/container_registry) + [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/ffmpeg) + [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg) + [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/ffmpeg.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/ffmpeg) + [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-ffmpeg%2Fjob%2Fmaster%2F&logo=jenkins)](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: | [![ffmpeg](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ffmpeg.png)](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-\ | + | arm64 | ✅ | arm64v8-\ | + | armhf| ✅ | arm32v7-\ | ## Usage