From 1a56f1b9f6e3b862855d01c9b1d30d9e95050690 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 27 Apr 2026 21:48:05 -0700 Subject: [PATCH 1/4] Pull logged to limit the risks of rate limit --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 162ada19..b5b2ff56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,12 +66,12 @@ jobs: - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v4 - uses: docker/login-action@v4 - if: github.event_name == 'push' + if: ${{ secrets.DOCKER_LOGIN != '' }} with: username: ${{ secrets.DOCKER_LOGIN }} password: ${{ secrets.DOCKER_PASSWORD }} - uses: docker/login-action@v4 - if: github.event_name == 'push' + if: ${{ secrets.GITHUB_TOKEN != '' }} with: registry: ghcr.io username: ${{ github.actor }} From 3f324013c05eb4de0557fa3485be33a3794f5985 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Mon, 27 Apr 2026 21:51:14 -0700 Subject: [PATCH 2/4] all the MRs in one !450, !451, !452, !453 , !454 --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5b2ff56..3c8b5b74 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,12 +31,12 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 with: python-version: "3.14" - run: pip install pre-commit packaging - - uses: actions/cache@v4 + - uses: actions/cache@v5 with: path: ~/.cache/pre-commit key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} @@ -48,7 +48,7 @@ jobs: build: ${{ steps.matrix.outputs.build }} manifest: ${{ steps.matrix.outputs.manifest }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - id: matrix run: | echo "build=$(jq -c '.build' docker-images/github-actions-matrix.json)" >> "$GITHUB_OUTPUT" @@ -63,7 +63,7 @@ jobs: matrix: include: ${{ fromJson(needs.generate-matrix.outputs.build) }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v4 - uses: docker/login-action@v4 if: ${{ secrets.DOCKER_LOGIN != '' }} @@ -174,18 +174,18 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Sync README to docs run: | mkdir -p docs printf -- '---\nlayout: default\ntitle: FFmpeg Docker Images\n---\n\n' > docs/index.md cat README.md >> docs/index.md - - uses: actions/configure-pages@v5 + - uses: actions/configure-pages@v6 - uses: actions/jekyll-build-pages@v1 with: source: ./docs destination: ./_site - - uses: actions/upload-pages-artifact@v3 + - uses: actions/upload-pages-artifact@v5 - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v5 From 54a1836eadc7554f795da7df9d484bfc1a83a992 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Tue, 28 Apr 2026 08:32:46 -0700 Subject: [PATCH 3/4] Bump actions --- .github/workflows/build.yml | 4 +++- README.md | 15 +++++++-------- docs/assets/css/style.scss | 4 ++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c8b5b74..f6c26181 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -175,11 +175,13 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} steps: - uses: actions/checkout@v6 - - name: Sync README to docs + - name: Sync README and CONTRIBUTING to docs run: | mkdir -p docs printf -- '---\nlayout: default\ntitle: FFmpeg Docker Images\n---\n\n' > docs/index.md cat README.md >> docs/index.md + printf -- '---\nlayout: default\ntitle: Contributing\n---\n\n' > docs/contributing.md + cat CONTRIBUTING.md >> docs/contributing.md - uses: actions/configure-pages@v6 - uses: actions/jekyll-build-pages@v1 with: diff --git a/README.md b/README.md index be35c52f..20ac1279 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # FFmpeg Docker image -[![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) -[![Github Container Registry Images](https://img.shields.io/badge/images-automated-blue?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/pkgs/container/ffmpeg) -[![gitlab pipeline status](https://gitlab.com/jrottenberg/ffmpeg/badges/main/pipeline.svg)](https://gitlab.com/jrottenberg/ffmpeg/commits/main) -[![GitHub Actions Build Status](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml/badge.svg)](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml) +[![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/) +[![Pulls](https://img.shields.io/docker/pulls/jrottenberg/ffmpeg.svg?logo=docker&style=plastic)](https://registry.hub.docker.com/v2/repositories/jrottenberg/ffmpeg/) +[![Actions](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml/badge.svg)](https://github.com/jrottenberg/ffmpeg/actions/workflows/build.yml) +[![Stars](https://img.shields.io/github/stars/jrottenberg/ffmpeg?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/stargazers) +[![Forks](https://img.shields.io/github/forks/jrottenberg/ffmpeg?logo=github&style=plastic)](https://github.com/jrottenberg/ffmpeg/network/members) 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). @@ -57,10 +56,10 @@ We used the ffmpeg support libraries from the Ubuntu distribution where possible This image is just like the above `ubuntu2404` container image, except we build all of the ffmpeg support libraries. This is in the spirit of the original intent of this project `jrottenberg/ffmpeg` alltogether. Building everything that ffmpeg needs, and ffmpeg itself from source. This gives us the most control over all of the details of release. The drawback of this is that its much harder to keep updated. The thought process of having both 'Ubuntu-2404' and 'Ubuntu-2404-edge' is that it makes updating the OS easier over time. **vaapi2404** - This release is like also `ubuntu2404` but enables: [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) when building ffmpeg + Based on `ubuntu2404` with [Video Acceleration API (VAAPI)](https://trac.ffmpeg.org/wiki/HWAccelIntro#VAAPI) enabled. **nvidia2404** - This release is like also `ubuntu2404` but enables: [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled + Based on `ubuntu2404` with [NVIDIA's hardware-accelerated encoding and decoding APIs](https://trac.ffmpeg.org/wiki/HWAccelIntro#CUDANVENCNVDEC) enabled. **alpine320** [alpine](https://alpinelinux.org/releases/) uses the os vendor libs, but ffmpeg is built from source. diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss index aba2d9e7..ad37763d 100644 --- a/docs/assets/css/style.scss +++ b/docs/assets/css/style.scss @@ -3,6 +3,10 @@ @import "jekyll-theme-minimal"; +footer a:hover { + font-weight: normal; +} + .wrapper { max-width: 1200px; width: 90%; From cf3c18a4dd11b284570457812bae69bab4e882d2 Mon Sep 17 00:00:00 2001 From: Julien Rottenberg Date: Tue, 28 Apr 2026 21:46:34 -0700 Subject: [PATCH 4/4] Use secres for docker pull --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f6c26181..8d787ff3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,12 +66,12 @@ jobs: - uses: actions/checkout@v6 - uses: docker/setup-buildx-action@v4 - uses: docker/login-action@v4 - if: ${{ secrets.DOCKER_LOGIN != '' }} + if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request' with: username: ${{ secrets.DOCKER_LOGIN }} password: ${{ secrets.DOCKER_PASSWORD }} - uses: docker/login-action@v4 - if: ${{ secrets.GITHUB_TOKEN != '' }} + if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request' with: registry: ghcr.io username: ${{ github.actor }}