From 4a3f98b8f760080f6fdb44983aac049c71e5d2c8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 23:20:21 +0000
Subject: [PATCH 1/2] Update mwader/static-ffmpeg Docker tag to v7.1.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e6928065..ed0dd533 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN ./gradlew runtime --no-daemon
 FROM gcr.io/distroless/base-nossl:nonroot AS bot
 
 # bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
-COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/local/bin/
+COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/local/bin/
 ENV FFMPEG_PATH=/usr/local/bin/ffmpeg
 
 COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/

From 64b63241e68af50e02241ebf9e01445765da9190 Mon Sep 17 00:00:00 2001
From: Roberto Cella <rob.uniud@gmail.com>
Date: Fri, 7 Mar 2025 20:33:17 +0100
Subject: [PATCH 2/2] update ffmpeg to latest version and disable its automatic
 updates from renovate

---
 .github/renovate.json           | 6 ++++++
 .github/workflows/unit-test.yml | 4 ++--
 Dockerfile                      | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 124d5b7f..8713b915 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -12,6 +12,12 @@
             "matchPackageNames": [
                 "*"
             ]
+        },
+        {
+            "matchPackageNames": [
+                "*ffmpeg**"
+            ],
+            "enabled": false
         }
     ],
     "extends": [
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 451c7032..f25040da 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -26,8 +26,8 @@ jobs:
       - name: Setup FFmpeg
         uses: FedericoCarboni/setup-ffmpeg@v3
         with:
-          # bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg|~7.0
-          ffmpeg-version: '7.0.2'
+          # bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg|~7.*
+          ffmpeg-version: '7.1.1'
 
       - name: Setup Java
         uses: actions/setup-java@v4
diff --git a/Dockerfile b/Dockerfile
index ed0dd533..bae254ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN ./gradlew runtime --no-daemon
 
 FROM gcr.io/distroless/base-nossl:nonroot AS bot
 
-# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
+# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.*
 COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/local/bin/
 ENV FFMPEG_PATH=/usr/local/bin/ffmpeg