From 3d0471538f255a583182ce058527d4102f0d2f66 Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Fri, 2 Feb 2024 17:20:56 +0100 Subject: [PATCH] Fix alpine version build --- .github/workflows/build_bundle-rpi.yaml | 2 +- .github/workflows/build_bundle.yaml | 2 +- .github_build/Build.bundle.env | 1 + .github_build/Build.bundle.rpi.env | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_bundle-rpi.yaml b/.github/workflows/build_bundle-rpi.yaml index a57e7ea0..79494a83 100644 --- 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 index 236b9021..4ab77746 100644 --- 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 index 241ac6cf..df71c9fb 100644 --- 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 index 3fdb7c3f..f67a500a 100644 --- 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