From 368f2ad0e22e5a15da2a0ac0f0e4c4b2da415f04 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 f7f4822..d249269 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,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/build/jre ./jre

From c65f7b8879778dafe8937d0bb5479d1c734c21b7 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                      | 7 +++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 124d5b7..8713b91 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 451c703..f25040d 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 d249269..b7099fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,14 +12,13 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz &&
     tar -xzf libwebp.tar.gz --one-top-level=libwebp --strip-components=1
 COPY settings.gradle build.gradle gradlew ./
 COPY gradle ./gradle
-RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
-    ./gradlew dependencies --no-daemon
+RUN --mount=type=cache,target=/home/gradle/.gradle/caches ./gradlew dependencies --no-daemon
 COPY . .
 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
 
@@ -28,4 +27,4 @@ COPY --from=builder /app/build/libs/Stickerify-shadow.jar .
 COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/
 COPY --from=builder /app/libwebp/bin/dwebp /usr/local/bin/
 
-CMD ["jre/bin/java", "-XX:+UseZGC", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify-shadow.jar"]
+CMD jre/bin/java -XX:+UseZGC -Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/ -jar Stickerify-shadow.jar