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 015857fa..589908cb 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 608753d4..827e64d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ RUN ./gradlew runtime FROM alpine 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/ +# 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 COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/