Skip to content

Commit c65f7b8

Browse files
committed
update ffmpeg to latest version and disable its automatic updates from renovate
1 parent 368f2ad commit c65f7b8

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/renovate.json

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"matchPackageNames": [
1313
"*"
1414
]
15+
},
16+
{
17+
"matchPackageNames": [
18+
"*ffmpeg**"
19+
],
20+
"enabled": false
1521
}
1622
],
1723
"extends": [

.github/workflows/unit-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
- name: Setup FFmpeg
2727
uses: FedericoCarboni/setup-ffmpeg@v3
2828
with:
29-
# bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg|~7.0
30-
ffmpeg-version: '7.0.2'
29+
# bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg|~7.*
30+
ffmpeg-version: '7.1.1'
3131

3232
- name: Setup Java
3333
uses: actions/setup-java@v4

Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -o libwebp.tar.gz &&
1212
tar -xzf libwebp.tar.gz --one-top-level=libwebp --strip-components=1
1313
COPY settings.gradle build.gradle gradlew ./
1414
COPY gradle ./gradle
15-
RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
16-
./gradlew dependencies --no-daemon
15+
RUN --mount=type=cache,target=/home/gradle/.gradle/caches ./gradlew dependencies --no-daemon
1716
COPY . .
1817
RUN ./gradlew runtime --no-daemon
1918

2019
FROM gcr.io/distroless/base-nossl:nonroot AS bot
2120

22-
# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.0
21+
# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|~7.*
2322
COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/local/bin/
2423
ENV FFMPEG_PATH=/usr/local/bin/ffmpeg
2524

@@ -28,4 +27,4 @@ COPY --from=builder /app/build/libs/Stickerify-shadow.jar .
2827
COPY --from=builder /app/libwebp/bin/cwebp /usr/local/bin/
2928
COPY --from=builder /app/libwebp/bin/dwebp /usr/local/bin/
3029

31-
CMD ["jre/bin/java", "-XX:+UseZGC", "-Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/", "-jar", "Stickerify-shadow.jar"]
30+
CMD jre/bin/java -XX:+UseZGC -Dcom.sksamuel.scrimage.webp.binary.dir=/usr/local/bin/ -jar Stickerify-shadow.jar

0 commit comments

Comments
 (0)