Merge branch 'jrottenberg:main' into deploy

Author: VietND96

.gitlab-ci.yml

@@ -2,7 +2,7 @@ pre-commit:
   image: python:3
   stage: lint
   script:
-    - pip install pre-commit
+    - pip install pre-commit packaging
     - pre-commit run --all-files --show-diff-on-failure
   artifacts:
     expire_in: 1 days

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos: # pre-commit autoupdate
   - repo: https://github.com/pycqa/flake8
-    rev: "6.0.0"
+    rev: "7.0.0"
     hooks:
       - id: flake8
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -22,19 +22,19 @@ repos: # pre-commit autoupdate
 
   # If you want to avoid flake8 errors due to unused vars or imports:
   - repo: https://github.com/myint/autoflake.git
-    rev: v2.0.2
+    rev: v2.2.1
     hooks:
       - id: autoflake
         args:
           [--in-place, --remove-all-unused-imports, --remove-unused-variables]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.12.1
     hooks:
       - id: black
         language_version: python3

README.md

@@ -19,7 +19,6 @@ This image can be used as a base for an encoding farm.
 There are different builds available:
 - alpine based images `ffmpeg:<version>-alpine` or `ffmpeg:<version>-alpine313`  (old versions with `ffmpeg:<version>-alpine312` , `ffmpeg:<version>-alpine311`)
   - alpine based scratch images `ffmpeg:<version>-scratch` or `ffmpeg:<version>-scratch313`   (old versions with `ffmpeg:<version>-scratch312` , `ffmpeg:<version>-scratch311`)
-- centos based images  `ffmpeg:<version>-centos` or  `ffmpeg:<version>-centos7` or `ffmpeg:<version>-centos8`
 - ubuntu based images `ffmpeg:<version>-ubuntu` or `ffmpeg:<version>-ubuntu2004` (old versions with `ffmpeg:<version>-ubuntu1804` , `ffmpeg:<version>-ubuntu1604`)
   - ubuntu based nvidia images `ffmpeg:<version>-nvidia` or `ffmpeg:<version>-nvidia2004` (old versions with `ffmpeg:<version>-nvidia1804`, `ffmpeg:<version>-nvidia1604`)
   - ubuntu based vaapi images `ffmpeg:<version>-vaapi1804` or `ffmpeg:<version>-vaapi2004` (old versions with `ffmpeg:<version>-vaapi1804`, `ffmpeg:<version>-nvidia1604`)
@@ -34,18 +33,10 @@ There are different builds available:
 - 4.3
 - 4.4
 
-Not all combinations are supported and older versions will fade out over time. See the table below for the currently supported combinations.
 
-| *Version*  | alpine38           | alpine312          | centos7            | centos8            | nvidia1804         | scratch38          | scratch312         | ubuntu1804         | ubuntu2004         | vaapi1804          | vaapi2004          |
-| ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ |
-| *3.2*      | :heavy_check_mark: | :x:                | :heavy_check_mark: | :x:                | :x:                | :heavy_check_mark: | :x:                | :x:                | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *3.3*      | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *3.4*      | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *4.0*      | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *4.1*      | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *4.2*      | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
-| *4.3*      | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| *snapshot* | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:                | :heavy_check_mark: |
+
+
+
 
 ### Generate list of recent images
 
@@ -260,3 +251,9 @@ See Dockerfile-env to update a version
 ## Contribute
 
 See [the contributing guide](CONTRIBUTING.md)
+
+
+
+## Legal
+
+Those docker images use code of <a href=http://ffmpeg.org>FFmpeg</a> licensed under the <a href=http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>LGPLv2.1</a> and their source can be downloaded on <a href=https://github.com/jrottenberg/ffmpeg>github.com/jrottenberg/ffmpeg</a>.

azure-pipelines.yml

@@ -27,8 +27,8 @@ stages:
               key: pre-commit | "4" | .pre-commit-config.yaml | "$(PY)"
               path: $(PRE_COMMIT_HOME)
 
-          - script: python -m pip install --upgrade pre-commit
-            displayName: install pre-commit
+          - script: python -m pip install --upgrade pre-commit packaging
+            displayName: install python deps
           - script: pre-commit run --all-files --show-diff-on-failure
             displayName: run pre-commit
 

docker-images/3.3/ubuntu2004/Dockerfile renamed to docker-images/2.8/ubuntu2004/Dockerfile

@@ -16,8 +16,8 @@ RUN     apt-get -yqq update && \
 
 FROM base as build
 
-ENV         FFMPEG_VERSION=3.3.9 \
-    AOM_VERSION=v1.0.0 \
+ENV         FFMPEG_VERSION=2.8.22 \
+    AOM_VERSION=v3.8.1 \
     CHROMAPRINT_VERSION=1.5.0 \
     FDKAAC_VERSION=0.1.5 \
     FONTCONFIG_VERSION=2.12.4 \
@@ -34,6 +34,7 @@ ENV         FFMPEG_VERSION=3.3.9 \
     OPENCOREAMR_VERSION=0.1.5 \
     OPUS_VERSION=1.2 \
     OPENJPEG_VERSION=2.1.2 \
+    PYTHON=python3 \
     THEORA_VERSION=1.1.1 \
     VORBIS_VERSION=1.3.5 \
     VPX_VERSION=1.8.0 \
@@ -67,7 +68,6 @@ ARG         LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade
 ARG         LIBARIBB24_SHA256SUM="f61560738926e57f9173510389634d8c06cabedfa857db4b28fb7704707ff128 v1.0.3.tar.gz"
 
 
-ARG         LD_LIBRARY_PATH=/opt/ffmpeg/lib
 ARG         MAKEFLAGS="-j2"
 ARG         PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig"
 ARG         PREFIX=/opt/ffmpeg
@@ -532,11 +532,9 @@ RUN  \
         --enable-libbluray \
         --enable-libfdk_aac \
         --enable-libfreetype \
-        --enable-libkvazaar \
         --enable-libmp3lame \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
-        --enable-libopenjpeg \
         --enable-libopus \
         --enable-libtheora \
         --enable-libvidstab \