Skip to content

Commit

Permalink
ffmpeg 5.0.1 (#334)
Browse files Browse the repository at this point in the history 
* ffmpeg 5.0.1



* switch to videotools for public images
  • Loading branch information
@jrottenberg
jrottenberg authored Apr 10, 2022
1 parent 5dc1f2c commit fefbecf
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 50 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repos: # pre-commit autoupdate
- id: flake8

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.2.0
hooks:
- id: trailing-whitespace
- id: check-added-large-files
Expand Down Expand Up @@ -34,7 +34,7 @@ repos: # pre-commit autoupdate
- id: isort

- repo: https://github.com/psf/black
rev: 21.12b0
rev: 22.3.0
hooks:
- id: black
language_version: python3
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
[![Docker Stars](https://img.shields.io/docker/stars/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/stars/count/)
[![Docker pulls](https://img.shields.io/docker/pulls/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/)
[![Docker Automated build](https://img.shields.io/docker/automated/jrottenberg/ffmpeg.svg?logo=docker)](https://hub.docker.com/r/jrottenberg/ffmpeg/tags)
[![Huthub Container Registry Images](https://img.shields.io/badge/images-automated-blue?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/pkgs/container/ffmpeg)
[![Github Container Registry Images](https://img.shields.io/badge/images-automated-blue?logo=github&style=plastic)](https://github.com/videotools/ffmpeg/pkgs/container/ffmpeg)
[![gitlab pipeline status](https://gitlab.com/jrottenberg/ffmpeg/badges/main/pipeline.svg)](https://gitlab.com/jrottenberg/ffmpeg/commits/main)
[![Azure Build Status](https://dev.azure.com/video-tools/ffmpeg/_apis/build/status/jrottenberg.ffmpeg)](https://dev.azure.com/video-tools/ffmpeg/_build/latest?definitionId=1)


This project prepares a minimalist Docker image with FFmpeg. It compiles FFmpeg from sources following instructions from the [Compilation Guide](https://trac.ffmpeg.org/wiki/CompilationGuide).

You can install the latest build of this image by running `docker pull jrottenberg/ffmpeg:${VERSION}-${VARIANT}` or `docker pull ghcr.io/jrottenberg/ffmpeg:${VERSION}-${VARIANT}`.
You can install the latest build of this image by running `docker pull jrottenberg/ffmpeg:${VERSION}-${VARIANT}` or `docker pull ghcr.io/videotools/ffmpeg:${VERSION}-${VARIANT}`.

This image can be used as a base for an encoding farm.

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variables:
- name: DOCKER
value: jrottenberg/ffmpeg
- name: GHCR
value: ghcr.io/jrottenberg/ffmpeg
value: ghcr.io/videotools/ffmpeg

stages:
- stage: lint
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/alpine313/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/centos7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/centos8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ FROM base AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/nvidia2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ FROM devel-base as build

ENV NVIDIA_HEADERS_VERSION=11.1.5.0

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/scratch313/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM alpine:3.13 AS build

WORKDIR /tmp/workdir

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/ubuntu1804/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/ubuntu2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/vaapi1804/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
2 changes: 1 addition & 1 deletion docker-images/5.0/vaapi2004/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN apt-get -yqq update && \

FROM base as build

ENV FFMPEG_VERSION=5.0 \
ENV FFMPEG_VERSION=5.0.1 \
AOM_VERSION=v1.0.0 \
CHROMAPRINT_VERSION=1.5.0 \
FDKAAC_VERSION=0.1.5 \
Expand Down
36 changes: 18 additions & 18 deletions docker-images/azure-jobs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,82 +8,82 @@ jobs:
maxParallel: 10
matrix:

ubuntu1804_5.0:
ubuntu1804_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: ubuntu1804
PARENT: ubuntu
ISPARENT: False


ubuntu2004_5.0:
ubuntu2004_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: ubuntu2004
PARENT: ubuntu
ISPARENT: True


alpine313_5.0:
alpine313_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: alpine313
PARENT: alpine
ISPARENT: True


centos7_5.0:
centos7_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: centos7
PARENT: centos
ISPARENT: False


centos8_5.0:
centos8_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: centos8
PARENT: centos
ISPARENT: True


scratch313_5.0:
scratch313_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: scratch313
PARENT: scratch
ISPARENT: True


vaapi1804_5.0:
vaapi1804_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: vaapi1804
PARENT: vaapi
ISPARENT: False


vaapi2004_5.0:
vaapi2004_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: vaapi2004
PARENT: vaapi
ISPARENT: True


nvidia2004_5.0:
nvidia2004_5.0.1:
MAJOR_VERSION: 5
VERSION: 5.0
LONG_VERSION: 5.0
LONG_VERSION: 5.0.1
VARIANT: nvidia2004
PARENT: nvidia
ISPARENT: True
Expand Down
36 changes: 18 additions & 18 deletions docker-images/gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,101 +7,101 @@ stages:
- ubuntu
- vaapi

5.0-ubuntu1804:
5.0.1-ubuntu1804:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: ubuntu1804
PARENT: "ubuntu"
ISPARENT: "False"

5.0-ubuntu2004:
5.0.1-ubuntu2004:
extends: .docker
stage: ubuntu
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: ubuntu2004
PARENT: "ubuntu"
ISPARENT: "True"

5.0-alpine313:
5.0.1-alpine313:
extends: .docker
stage: alpine
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: alpine313
PARENT: "alpine"
ISPARENT: "True"

5.0-centos7:
5.0.1-centos7:
extends: .docker
stage: centos
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: centos7
PARENT: "centos"
ISPARENT: "False"

5.0-centos8:
5.0.1-centos8:
extends: .docker
stage: centos
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: centos8
PARENT: "centos"
ISPARENT: "True"

5.0-scratch313:
5.0.1-scratch313:
extends: .docker
stage: scratch
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: scratch313
PARENT: "scratch"
ISPARENT: "True"

5.0-vaapi1804:
5.0.1-vaapi1804:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: vaapi1804
PARENT: "vaapi"
ISPARENT: "False"

5.0-vaapi2004:
5.0.1-vaapi2004:
extends: .docker
stage: vaapi
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: vaapi2004
PARENT: "vaapi"
ISPARENT: "True"

5.0-nvidia2004:
5.0.1-nvidia2004:
extends: .docker
stage: nvidia
variables:
MAJOR_VERSION: 5
VERSION: "5.0"
LONG_VERSION: "5.0"
LONG_VERSION: "5.0.1"
VARIANT: nvidia2004
PARENT: "nvidia"
ISPARENT: "True"
Expand Down

0 comments on commit fefbecf

Please sign in to comment.