diff --git a/.dockerignore b/.dockerignore index d4228029..da8a29be 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,4 +14,3 @@ Dockerfile *.dockerfile qodana.baseline.json Bumpfile -hashupdate diff --git a/.github/renovate.json b/.github/renovate.json index 124d5b7f..7745907c 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -10,7 +10,8 @@ "patch" ], "matchPackageNames": [ - "*" + "*", + "!*ffmpeg*" ] } ], diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index a59b91ac..5a7488e4 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -26,7 +26,7 @@ jobs: - name: Setup FFmpeg and FFprobe uses: ./.github/actions/setup-ffmpeg with: - # bump: ffmpeg-ci /ffmpeg-version: '([\d.]+)'/ docker:mwader/static-ffmpeg + # bump: ffmpeg-ci /ffmpeg-version: ([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|* ffmpeg-version: 8.0.1 - name: Setup Java diff --git a/Dockerfile b/Dockerfile index 68df3761..7518a3ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:25-alpine AS builder WORKDIR /app -# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg +# bump: ffmpeg /static-ffmpeg:([\d.]+)/ docker:mwader/static-ffmpeg|/\d+\./|* COPY --from=mwader/static-ffmpeg:8.0.1 /ff* /usr/bin/ COPY . . diff --git a/hashupdate b/hashupdate deleted file mode 100755 index 0dacddf9..00000000 --- a/hashupdate +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Usage: hashupdate -URL=$(grep "$2_URL=" "$1" | sed -E 's/.*="([^"]*)".*/\1/' | sed "s/\$$2_VERSION/$3/g") -SHA256=$(curl -sL "$URL" | sha256sum | sed -e 's/ -//g') -sed -i -E "s/$2_SHA256=.*/$2_SHA256=$SHA256/" "$1"