Skip to content

Commit 29d38ef

Browse files
committed
update README
1 parent c5bf707 commit 29d38ef

File tree

3 files changed

+200
-198
lines changed

3 files changed

+200
-198
lines changed

.github/workflows/ffmpeg-release.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,8 @@ jobs:
1212
if: startsWith(github.ref, 'refs/tags/v')
1313
strategy:
1414
matrix:
15-
ffmpeg: ["6.0", "5.1.2", "4.4.3"]
16-
flavor: [linux, qsv-linux, windows]
17-
hwlib: [libmfx]
18-
include:
19-
- ffmpeg: "6.0"
20-
flavor: qsv-linux
21-
hwlib: libvpl
15+
ffmpeg: ["6.0", "5.1.3", "4.4.4"]
16+
flavor: [linux, windows]
2217
steps:
2318
- name: Checkout
2419
uses: actions/checkout@v3
@@ -29,25 +24,19 @@ jobs:
2924
- name: Set build target (linux)
3025
if: matrix.flavor == 'linux'
3126
run: |
32-
echo "build_tag=" >> $GITHUB_ENV
33-
echo "target_os=linux-amd64" >> $GITHUB_ENV
34-
35-
- name: Set build target (qsv-linux)
36-
if: matrix.flavor == 'qsv-linux'
37-
run: |
38-
echo "build_tag=-${{ matrix.hwlib }}" >> $GITHUB_ENV
27+
echo "build_tag=linux" >> $GITHUB_ENV
3928
echo "target_os=linux-amd64" >> $GITHUB_ENV
4029
4130
- name: Set build target (windows)
4231
if: matrix.flavor == 'windows'
4332
run: |
44-
echo "build_tag=-windows" >> $GITHUB_ENV
33+
echo "build_tag=windows" >> $GITHUB_ENV
4534
echo "target_os=x64" >> $GITHUB_ENV
4635
4736
- name: Export - ffmpeg
4837
run: |
49-
docker buildx build --platform linux/amd64 --target export${{ env.build_tag }} --output type=local,dest=/tmp/build \
50-
-t ffmpeg${{ env.build_tag }} --build-arg FFMPEG_VERSION=${{ matrix.ffmpeg }} -f ./Dockerfile .
38+
docker buildx build --platform linux/amd64 --target ffmpeg-${{ env.build_tag }}-export --output type=local,dest=/tmp/build \
39+
-t ffmpeg-${{ env.build_tag }} --build-arg FFMPEG_VERSION=${{ matrix.ffmpeg }} -f ./Dockerfile .
5140
5241
- name: Archive artifact
5342
run: |

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# syntax = docker/dockerfile:1.5
22

33
ARG FFMPEG_VERSION="6.0"
4-
FROM akashisn/ffmpeg:${FFMPEG_VERSION} AS ffmpeg-image
5-
FROM ghcr.io/akashisn/ffmpeg-windows:${FFMPEG_VERSION} AS ffmpeg-image-windows
4+
FROM akashisn/ffmpeg:${FFMPEG_VERSION} AS ffmpeg-linux-image
5+
FROM ghcr.io/akashisn/ffmpeg-windows:${FFMPEG_VERSION} AS ffmpeg-windows-image
66

77
#
88
# build env base image
@@ -177,18 +177,18 @@ COPY --from=ffmpeg-windows-build /dist /
177177
#
178178
FROM scratch AS ffmpeg-linux-export
179179

180-
COPY --from=ffmpeg-image /usr/local/bin /bin
181-
COPY --from=ffmpeg-image /usr/local/lib /lib
182-
COPY --from=ffmpeg-image /usr/local/configure_options /
183-
COPY --from=ffmpeg-image /usr/local/run.sh /
180+
COPY --from=ffmpeg-linux-image /usr/local/bin /bin
181+
COPY --from=ffmpeg-linux-image /usr/local/lib /lib
182+
COPY --from=ffmpeg-linux-image /usr/local/configure_options /
183+
COPY --from=ffmpeg-linux-image /usr/local/run.sh /
184184

185185

186186
#
187187
# export windws exe
188188
#
189189
FROM scratch AS ffmpeg-windows-export
190190

191-
COPY --from=ffmpeg-image-windows / /
191+
COPY --from=ffmpeg-windows-image / /
192192

193193

194194
#

0 commit comments

Comments
 (0)