diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 162ada19..8d787ff3 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,15 +63,15 @@ 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: github.event_name == 'push' + 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: github.event_name == 'push' + if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request' with: registry: ghcr.io username: ${{ github.actor }} @@ -174,18 +174,20 @@ jobs: name: github-pages url: ${{ steps.deployment.outputs.page_url }} steps: - - uses: actions/checkout@v4 - - name: Sync README to docs + - uses: actions/checkout@v6 + - 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 - - uses: actions/configure-pages@v5 + 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: 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 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%;