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 f7f4822..b7099fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,14 @@ 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 -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/build/jre ./jre @@ -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