Skip to content

Commit 07cd18a

Browse files
committed
Fix alpine version build
1 parent 64010da commit 07cd18a

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

.github/workflows/build_bundle-rpi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
file: ./Dockerfile.bundle
6262
build-args: |
6363
CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
64-
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
64+
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
6565
platforms: linux/arm/v7,linux/arm64
6666
push: true
6767
tags: |

.github/workflows/build_bundle-rpi_dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
file: ./Dockerfile.bundle
6161
build-args: |
6262
CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
63-
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
63+
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-rpi-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
6464
platforms: linux/arm64,linux/arm/v7
6565
push: true
6666
tags: |

.github/workflows/build_bundle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
file: ./Dockerfile.bundle
6262
build-args: |
6363
CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-${{ env.OS_VERSION }}-${{ env.CORE_VERSION }}
64-
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
64+
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
6565
platforms: linux/amd64,linux/arm64,linux/arm/v7
6666
push: true
6767
tags: |

.github/workflows/build_bundle_dev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
file: ./Dockerfile.bundle
6161
build-args: |
6262
CORE_IMAGE=datarhei/base:${{ env.OS_NAME }}-core-dev
63-
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION }}-${{ env.FFMPEG_VERSION }}
63+
FFMPEG_IMAGE=datarhei/base:${{ env.OS_NAME }}-ffmpeg-${{ env.OS_VERSION_FFMPEG }}-${{ env.FFMPEG_VERSION }}
6464
platforms: linux/amd64,linux/arm64,linux/arm/v7
6565
push: true
6666
tags: |

.github_build/Build.alpine.env

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# CORE ALPINE BASE IMAGE
22
OS_NAME=alpine
33
OS_VERSION=3.19
4+
OS_VERSION_FFMPEG=3.16
45
GOLANG_IMAGE=golang:1.21-alpine3.19
56
CORE_VERSION=16.14.0

0 commit comments

Comments
 (0)