Fix alpine version build

datarhei · Feb 2, 2024 · 3d04715 · 3d04715
1 parent 7f18dcf
commit 3d04715
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build_bundle-rpi.yaml b/.github/workflows/build_bundle-rpi.yaml
@@ -52,7 +52,7 @@ jobs:
           file: ./Dockerfile
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui:${{ env.RESTREAMER_UI_VERSION }}
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
           platforms: linux/arm64,linux/arm/v7
           push: true

diff --git a/.github/workflows/build_bundle.yaml b/.github/workflows/build_bundle.yaml
@@ -53,7 +53,7 @@ jobs:
           build-args: |
             RESTREAMER_UI_IMAGE=datarhei/restreamer-ui:${{ env.RESTREAMER_UI_VERSION }}
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
-            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
+            FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: true
           tags: |

diff --git a/.github_build/Build.bundle.env b/.github_build/Build.bundle.env
@@ -1,6 +1,7 @@
 # RESTREAMER BUNDLE
 OS_NAME=alpine
 OS_VERSION=3.19
+OS_VERSION_FFMPEG=3.16
 RESTREAMER_UI_VERSION=1.10.0
 CORE_VERSION=16.14.0
 FFMPEG_VERSION=5.1.3

diff --git a/.github_build/Build.bundle.rpi.env b/.github_build/Build.bundle.rpi.env
@@ -1,6 +1,7 @@
 # RESTREAMER RPI BUNDLE
 OS_NAME=alpine
 OS_VERSION=3.19
+OS_VERSION_FFMPEG=3.16
 RESTREAMER_UI_VERSION=1.10.0
 CORE_VERSION=16.14.0
 FFMPEG_VERSION=5.1.3