diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 3b733b3b..3a63630d 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -55,6 +55,25 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x + - name: Docker meta with ffmpeg + id: meta-ffmpeg + uses: docker/metadata-action@v5 + with: + images: xhofe/alist + flavor: | + latest=true + suffix=-ffmpeg,onlatest=true + + - name: Build and push with ffmpeg + id: docker_build_ffmpeg + uses: docker/build-push-action@v5 + with: + file: Dockerfile.ffmpeg + push: ${{ github.event_name == 'push' }} + tags: ${{ steps.meta-ffmpeg.outputs.tags }} + labels: ${{ steps.meta-ffmpeg.outputs.labels }} + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x + build_docker_with_aria2: needs: build_docker name: Build docker with aria2 @@ -80,4 +99,4 @@ jobs: with: github_token: ${{ secrets.MY_TOKEN }} branch: main - repository: alist-org/with_aria2 \ No newline at end of file + repository: alist-org/with_aria2 diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml index b029484e..10f85542 100644 --- a/.github/workflows/release_docker.yml +++ b/.github/workflows/release_docker.yml @@ -49,6 +49,25 @@ jobs: labels: ${{ steps.meta.outputs.labels }} platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x + - name: Docker meta with ffmpeg + id: meta-ffmpeg + uses: docker/metadata-action@v5 + with: + images: xhofe/alist + flavor: | + latest=true + suffix=-ffmpeg,onlatest=true + + - name: Build and push with ffmpeg + id: docker_build_ffmpeg + uses: docker/build-push-action@v5 + with: + file: Dockerfile.ffmpeg + push: true + tags: ${{ steps.meta-ffmpeg.outputs.tags }} + labels: ${{ steps.meta-ffmpeg.outputs.labels }} + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x + release_docker_with_aria2: needs: release_docker name: Release docker with aria2 diff --git a/Dockerfile.ffmpeg b/Dockerfile.ffmpeg new file mode 100644 index 00000000..9799d777 --- /dev/null +++ b/Dockerfile.ffmpeg @@ -0,0 +1,4 @@ +FROM xhofe/alist:latest +RUN apk update && \ + apk add --no-cache ffmpeg \ + rm -rf /var/cache/apk/* \ No newline at end of file