From 1c40b99c932006aab23baed14d10e7f9f0586e11 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sun, 2 Mar 2025 11:23:23 -0800 Subject: [PATCH 1/3] Extra ENV breaking build --- docker-images/7.0/nvidia2404/Dockerfile | 2 +- docker-images/7.1/nvidia2404/Dockerfile | 2 +- templates/Dockerfile-template.nvidia2204 | 2 +- templates/Dockerfile-template.nvidia2404 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-images/7.0/nvidia2404/Dockerfile b/docker-images/7.0/nvidia2404/Dockerfile index dd63f570..6414f108 100644 --- a/docker-images/7.0/nvidia2404/Dockerfile +++ b/docker-images/7.0/nvidia2404/Dockerfile @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV ENV FFMPEG_VERSION=7.0.2 +ENV FFMPEG_VERSION=7.0.2 ENV NVIDIA_HEADERS_VERSION=11.1.5.3 diff --git a/docker-images/7.1/nvidia2404/Dockerfile b/docker-images/7.1/nvidia2404/Dockerfile index a58cb3b1..37a4ee3f 100644 --- a/docker-images/7.1/nvidia2404/Dockerfile +++ b/docker-images/7.1/nvidia2404/Dockerfile @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1 ENV NVIDIA_HEADERS_VERSION=11.1.5.3 diff --git a/templates/Dockerfile-template.nvidia2204 b/templates/Dockerfile-template.nvidia2204 index bdc9811e..85a034a8 100644 --- a/templates/Dockerfile-template.nvidia2204 +++ b/templates/Dockerfile-template.nvidia2204 @@ -32,7 +32,7 @@ FROM devel-base as build ENV NVIDIA_HEADERS_VERSION=11.1.5.3 -ENV %%ENV%% +%%ENV%% RUN buildDeps="autoconf \ automake \ diff --git a/templates/Dockerfile-template.nvidia2404 b/templates/Dockerfile-template.nvidia2404 index e84cd280..8ffad353 100644 --- a/templates/Dockerfile-template.nvidia2404 +++ b/templates/Dockerfile-template.nvidia2404 @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV %%ENV%% +%%ENV%% # Note: I don't think we need 'ca-certificates' ARG DEBIAN_FRONTEND=noninteractive From 5fda98b1f4b54c626fb3225229bb9dabf7ffa837 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Wed, 19 Mar 2025 14:45:41 -0700 Subject: [PATCH 2/3] 7.1.1 --- docker-images/7.1/alpine320/Dockerfile | 2 +- docker-images/7.1/nvidia2404/Dockerfile | 80 ++++++++++---------- docker-images/7.1/scratch320/Dockerfile | 2 +- docker-images/7.1/ubuntu2404-edge/Dockerfile | 2 +- docker-images/7.1/ubuntu2404/Dockerfile | 2 +- docker-images/7.1/vaapi2404/Dockerfile | 2 +- docker-images/azure-jobs.yml | 24 +++--- docker-images/gitlab-ci.yml | 24 +++--- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/docker-images/7.1/alpine320/Dockerfile b/docker-images/7.1/alpine320/Dockerfile index eb7dd5be..bd4179ed 100644 --- a/docker-images/7.1/alpine320/Dockerfile +++ b/docker-images/7.1/alpine320/Dockerfile @@ -20,7 +20,7 @@ RUN chmod +x /tmp/workdir/generate-source-of-truth-ffmpeg-versions.py && chmod +x /tmp/workdir/build_source.sh && \ chmod +x /tmp/workdir/install_ffmpeg.sh -ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1.1 ENV MAKEFLAGS="-j2" ENV PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig:/opt/ffmpeg/lib/x86_64-linux-gnu/pkgconfig:/opt/ffmpeg/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig" diff --git a/docker-images/7.1/nvidia2404/Dockerfile b/docker-images/7.1/nvidia2404/Dockerfile index 37a4ee3f..e46fcdac 100644 --- a/docker-images/7.1/nvidia2404/Dockerfile +++ b/docker-images/7.1/nvidia2404/Dockerfile @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV FFMPEG_VERSION=7.1 +ENV ENV FFMPEG_VERSION=7.1.1 ENV NVIDIA_HEADERS_VERSION=11.1.5.3 @@ -126,43 +126,43 @@ RUN apt-get -yqq update && \ chmod +x /tmp/workdir/install_ffmpeg.sh RUN buildDeps="autoconf \ - automake \ - cmake \ - build-essential \ - texinfo \ - curl \ - wget \ - tar \ - bzip2 \ - libexpat1-dev \ - gcc \ - git \ - git-core \ - gperf \ - libtool \ - make \ - meson \ - ninja-build \ - nasm \ - perl \ - pkg-config \ - python3 \ - yasm \ - zlib1g-dev \ - libfreetype6-dev \ - libgnutls28-dev \ - libsdl2-dev \ - libva-dev \ - libvdpau-dev \ - libnuma-dev \ - libdav1d-dev \ - openssl \ - libssl-dev \ - expat \ - libgomp1 \ - ca-certificates \ - libxcb-shape0-dev \ - libavformat-dev" && \ + automake \ + cmake \ + build-essential \ + texinfo \ + curl \ + wget \ + tar \ + bzip2 \ + libexpat1-dev \ + gcc \ + git \ + git-core \ + gperf \ + libtool \ + make \ + meson \ + ninja-build \ + nasm \ + perl \ + pkg-config \ + python3 \ + yasm \ + zlib1g-dev \ + libfreetype6-dev \ + libgnutls28-dev \ + libsdl2-dev \ + libva-dev \ + libvdpau-dev \ + libnuma-dev \ + libdav1d-dev \ + openssl \ + libssl-dev \ + expat \ + libgomp1 \ + ca-certificates \ + libxcb-shape0-dev \ + libavformat-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -170,7 +170,7 @@ RUN \ echo "Installing dependencies..." && \ apt-get install -yq --no-install-recommends ${OPENCORE_PKGS} ${X264_PKGS} ${X265_PKGS} ${OGG_PKGS} ${OPUS_PKGS} ${VORBIS_PKGS} ${VPX_PKGS} ${WEBP_PKGS} ${MP3LAME_PKGS} ${XVIDCORE_PKGS} ${FDKAAC_PKGS} ${OPENJP_PKGS} ${FREETYPE_PKGS} ${VIDSTAB_PKGS} ${FRIBIDI_PKGS} ${FONTCONFIG_PKGS} ${LIBASS_PKGS} ${AOM_PKGS} ${SVTAV1_PKGS} ${DAV1D_PKGS} ${XORG_MACROS_PKGS} ${XPROTO_PKGS} ${XAU_PKGS} ${PTHREADS_STUBS_PKGS} ${XML2_PKGS} ${BLURAY_PKGS} ${ZMQ_PKGS} ${PNG_PKGS} ${ARIBB24_PKGS} ${ZIMG_PKGS} ${THEORA_PKGS} ${SRT_PKGS} ${LIBDRM_PKGS} - # apt install libdrm-dev +# apt install libdrm-dev ## libvmaf https://github.com/Netflix/vmaf ## https://github.com/Netflix/vmaf/issues/788#issuecomment-756098059 @@ -228,7 +228,7 @@ RUN apt-get -yqq update && \ apt-get clean -y LABEL org.opencontainers.image.authors="julien@rottenberg.info" \ - org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg + org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 diff --git a/docker-images/7.1/scratch320/Dockerfile b/docker-images/7.1/scratch320/Dockerfile index 4f645e31..fdb3a2f5 100644 --- a/docker-images/7.1/scratch320/Dockerfile +++ b/docker-images/7.1/scratch320/Dockerfile @@ -21,7 +21,7 @@ RUN chmod +x /tmp/workdir/generate-source-of-truth-ffmpeg-versions.py && chmod +x /tmp/workdir/build_source.sh && \ chmod +x /tmp/workdir/install_ffmpeg.sh -ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1.1 ENV MAKEFLAGS="-j2" ENV PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig:/opt/ffmpeg/lib/x86_64-linux-gnu/pkgconfig:/opt/ffmpeg/lib/aarch64-linux-gnu/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig" diff --git a/docker-images/7.1/ubuntu2404-edge/Dockerfile b/docker-images/7.1/ubuntu2404-edge/Dockerfile index 0389daa7..b0c0e928 100644 --- a/docker-images/7.1/ubuntu2404-edge/Dockerfile +++ b/docker-images/7.1/ubuntu2404-edge/Dockerfile @@ -16,7 +16,7 @@ COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1.1 # fribidi ARG FRIBIDI_PKGS="libfribidi-dev libfribidi0" diff --git a/docker-images/7.1/ubuntu2404/Dockerfile b/docker-images/7.1/ubuntu2404/Dockerfile index 0acd0deb..8a273717 100644 --- a/docker-images/7.1/ubuntu2404/Dockerfile +++ b/docker-images/7.1/ubuntu2404/Dockerfile @@ -16,7 +16,7 @@ COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1.1 ## opencore-amr - https://sourceforge.net/projects/opencore-amr/ ## x264 - http://www.videolan.org/developers/x264.html diff --git a/docker-images/7.1/vaapi2404/Dockerfile b/docker-images/7.1/vaapi2404/Dockerfile index c7da0a9d..94ff6083 100644 --- a/docker-images/7.1/vaapi2404/Dockerfile +++ b/docker-images/7.1/vaapi2404/Dockerfile @@ -16,7 +16,7 @@ COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV FFMPEG_VERSION=7.1 +ENV FFMPEG_VERSION=7.1.1 ## opencore-amr - https://sourceforge.net/projects/opencore-amr/ ## x264 - http://www.videolan.org/developers/x264.html diff --git a/docker-images/azure-jobs.yml b/docker-images/azure-jobs.yml index 72d553a0..25cf3269 100644 --- a/docker-images/azure-jobs.yml +++ b/docker-images/azure-jobs.yml @@ -8,55 +8,55 @@ jobs: maxParallel: 10 matrix: - ubuntu2404_7.1: + ubuntu2404_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: ubuntu2404 PARENT: ubuntu ISPARENT: True - ubuntu2404-edge_7.1: + ubuntu2404-edge_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: ubuntu2404-edge PARENT: ubuntu-edge ISPARENT: True - alpine320_7.1: + alpine320_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: alpine320 PARENT: alpine ISPARENT: True - scratch320_7.1: + scratch320_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: scratch320 PARENT: scratch ISPARENT: True - vaapi2404_7.1: + vaapi2404_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: vaapi2404 PARENT: vaapi ISPARENT: True - nvidia2404_7.1: + nvidia2404_7.1.1: MAJOR_VERSION: 7 VERSION: 7.1 - LONG_VERSION: 7.1 + LONG_VERSION: 7.1.1 VARIANT: nvidia2404 PARENT: nvidia ISPARENT: True diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml index f1cbf1b5..84561e02 100644 --- a/docker-images/gitlab-ci.yml +++ b/docker-images/gitlab-ci.yml @@ -7,68 +7,68 @@ stages: - ubuntu-edge - vaapi -7.1-ubuntu2404: +7.1.1-ubuntu2404: extends: .docker stage: ubuntu variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: ubuntu2404 PARENT: "ubuntu" ISPARENT: "True" -7.1-ubuntu2404-edge: +7.1.1-ubuntu2404-edge: extends: .docker stage: ubuntu-edge variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: ubuntu2404-edge PARENT: "ubuntu-edge" ISPARENT: "True" -7.1-alpine320: +7.1.1-alpine320: extends: .docker stage: alpine variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: alpine320 PARENT: "alpine" ISPARENT: "True" -7.1-scratch320: +7.1.1-scratch320: extends: .docker stage: scratch variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: scratch320 PARENT: "scratch" ISPARENT: "True" -7.1-vaapi2404: +7.1.1-vaapi2404: extends: .docker stage: vaapi variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: vaapi2404 PARENT: "vaapi" ISPARENT: "True" -7.1-nvidia2404: +7.1.1-nvidia2404: extends: .docker stage: nvidia variables: MAJOR_VERSION: 7 VERSION: "7.1" - LONG_VERSION: "7.1" + LONG_VERSION: "7.1.1" VARIANT: nvidia2404 PARENT: "nvidia" ISPARENT: "True" From 7c459c660d7a788ac881127242899221dee84735 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Sun, 6 Apr 2025 19:54:30 -0700 Subject: [PATCH 3/3] pre-commit --- .pre-commit-config.yaml | 8 +-- docker-images/7.1/nvidia2404/Dockerfile | 80 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d8338cc4..40f789a3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,11 +1,11 @@ repos: # pre-commit autoupdate - repo: https://github.com/pycqa/flake8 - rev: "7.1.1" + rev: "7.2.0" hooks: - id: flake8 - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace - id: check-added-large-files @@ -29,12 +29,12 @@ repos: # pre-commit autoupdate [--in-place, --remove-all-unused-imports, --remove-unused-variables] - repo: https://github.com/pycqa/isort - rev: 5.13.2 + rev: 6.0.1 hooks: - id: isort - repo: https://github.com/psf/black - rev: 24.8.0 + rev: 25.1.0 hooks: - id: black language_version: python3 diff --git a/docker-images/7.1/nvidia2404/Dockerfile b/docker-images/7.1/nvidia2404/Dockerfile index e46fcdac..de14ea8d 100644 --- a/docker-images/7.1/nvidia2404/Dockerfile +++ b/docker-images/7.1/nvidia2404/Dockerfile @@ -18,7 +18,7 @@ COPY download_tarballs.sh /tmp/workdir COPY build_source.sh /tmp/workdir COPY install_ffmpeg.sh /tmp/workdir -ENV ENV FFMPEG_VERSION=7.1.1 +ENV FFMPEG_VERSION=7.1.1 ENV NVIDIA_HEADERS_VERSION=11.1.5.3 @@ -126,43 +126,43 @@ RUN apt-get -yqq update && \ chmod +x /tmp/workdir/install_ffmpeg.sh RUN buildDeps="autoconf \ - automake \ - cmake \ - build-essential \ - texinfo \ - curl \ - wget \ - tar \ - bzip2 \ - libexpat1-dev \ - gcc \ - git \ - git-core \ - gperf \ - libtool \ - make \ - meson \ - ninja-build \ - nasm \ - perl \ - pkg-config \ - python3 \ - yasm \ - zlib1g-dev \ - libfreetype6-dev \ - libgnutls28-dev \ - libsdl2-dev \ - libva-dev \ - libvdpau-dev \ - libnuma-dev \ - libdav1d-dev \ - openssl \ - libssl-dev \ - expat \ - libgomp1 \ - ca-certificates \ - libxcb-shape0-dev \ - libavformat-dev" && \ + automake \ + cmake \ + build-essential \ + texinfo \ + curl \ + wget \ + tar \ + bzip2 \ + libexpat1-dev \ + gcc \ + git \ + git-core \ + gperf \ + libtool \ + make \ + meson \ + ninja-build \ + nasm \ + perl \ + pkg-config \ + python3 \ + yasm \ + zlib1g-dev \ + libfreetype6-dev \ + libgnutls28-dev \ + libsdl2-dev \ + libva-dev \ + libvdpau-dev \ + libnuma-dev \ + libdav1d-dev \ + openssl \ + libssl-dev \ + expat \ + libgomp1 \ + ca-certificates \ + libxcb-shape0-dev \ + libavformat-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -170,7 +170,7 @@ RUN \ echo "Installing dependencies..." && \ apt-get install -yq --no-install-recommends ${OPENCORE_PKGS} ${X264_PKGS} ${X265_PKGS} ${OGG_PKGS} ${OPUS_PKGS} ${VORBIS_PKGS} ${VPX_PKGS} ${WEBP_PKGS} ${MP3LAME_PKGS} ${XVIDCORE_PKGS} ${FDKAAC_PKGS} ${OPENJP_PKGS} ${FREETYPE_PKGS} ${VIDSTAB_PKGS} ${FRIBIDI_PKGS} ${FONTCONFIG_PKGS} ${LIBASS_PKGS} ${AOM_PKGS} ${SVTAV1_PKGS} ${DAV1D_PKGS} ${XORG_MACROS_PKGS} ${XPROTO_PKGS} ${XAU_PKGS} ${PTHREADS_STUBS_PKGS} ${XML2_PKGS} ${BLURAY_PKGS} ${ZMQ_PKGS} ${PNG_PKGS} ${ARIBB24_PKGS} ${ZIMG_PKGS} ${THEORA_PKGS} ${SRT_PKGS} ${LIBDRM_PKGS} -# apt install libdrm-dev + # apt install libdrm-dev ## libvmaf https://github.com/Netflix/vmaf ## https://github.com/Netflix/vmaf/issues/788#issuecomment-756098059 @@ -228,7 +228,7 @@ RUN apt-get -yqq update && \ apt-get clean -y LABEL org.opencontainers.image.authors="julien@rottenberg.info" \ - org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg + org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64