bump jf7 to main

feederbox826 · Nov 8, 2024 · 4e43908 · 4e43908
1 parent f171c0f
commit 4e43908
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -35,17 +35,6 @@ jobs:
         hwaccel-develop
       cachetag:
         hwaccel-develop
-    secrets:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-  docker-jf7:
-    uses: ./.github/workflows/docker-hwaccel.yml
-    with:
-      upstream: development
-      tags: hwaccel-develop-jf7
-      cachetag: hwaccel-develop-jf7
-      buildarg: "FFMPEG_VERSION=7"
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/dockerfile/hwaccel.Dockerfile b/dockerfile/hwaccel.Dockerfile
@@ -14,7 +14,7 @@ ARG \
   OFFICIAL_BUILD="false" \
   DEBIAN_FRONTEND="noninteractive" \
   TARGETPLATFORM \
-  FFMPEG_VERSION=6 \
+  FFMPEG_VERSION=7 \
   STASH_TAG="latest"
 # labels
 LABEL \