ci(docker): using docker build args instead of extra dockerfile for ffmpeg (#6989)

* build: using docker build arg to determine install ffmpeg or not

* ci: pass build-args to ffmpeg image build step
This commit is contained in:
Mmx
2024-08-15 21:48:48 +08:00
committed by GitHub
parent 8e6c1aa78d
commit 1f652e2e7d
5 changed files with 27 additions and 20 deletions

View File

@ -74,19 +74,16 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
- name: Replace dockerfile tag
run: |
sed -i -e "s/latest/main/g" Dockerfile.ffmpeg
- name: Build and push with ffmpeg
id: docker_build_ffmpeg
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.ffmpeg
file: Dockerfile.ci
push: ${{ github.event_name == 'push' }}
tags: ${{ steps.meta-ffmpeg.outputs.tags }}
labels: ${{ steps.meta-ffmpeg.outputs.labels }}
build-args: INSTALL_FFMPEG=true
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
build_docker_with_aria2:

View File

@ -74,10 +74,11 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.ffmpeg
file: Dockerfile.ci
push: true
tags: ${{ steps.meta-ffmpeg.outputs.tags }}
labels: ${{ steps.meta-ffmpeg.outputs.labels }}
build-args: INSTALL_FFMPEG=true
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x
release_docker_with_aria2: