Fix alpine version build

datarhei · Feb 2, 2024 · 07cd18a · 07cd18a
1 parent 64010da
commit 07cd18a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build_bundle-rpi.yaml b/.github/workflows/build_bundle-rpi.yaml
@@ -61,7 +61,7 @@ jobs:
                   file: ./Dockerfile.bundle
                   build-args: |
                       CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_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 }}
                   platforms: linux/arm/v7,linux/arm64
                   push: true
                   tags: |

diff --git a/.github/workflows/build_bundle-rpi_dev.yaml b/.github/workflows/build_bundle-rpi_dev.yaml
@@ -60,7 +60,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            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 }}
           platforms: linux/arm64,linux/arm/v7
           push: true
           tags: |

diff --git a/.github/workflows/build_bundle.yaml b/.github/workflows/build_bundle.yaml
@@ -61,7 +61,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             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/workflows/build_bundle_dev.yaml b/.github/workflows/build_bundle_dev.yaml
@@ -60,7 +60,7 @@ jobs:
           file: ./Dockerfile.bundle
           build-args: |
             CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
-            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.alpine.env b/.github_build/Build.alpine.env
@@ -1,5 +1,6 @@
 # CORE ALPINE BASE IMAGE
 OS_NAME=alpine
 OS_VERSION=3.19
+OS_VERSION_FFMPEG=3.16
 GOLANG_IMAGE=golang:1.21-alpine3.19
 CORE_VERSION=16.14.0