Skip to content

Commit 3944a5c

Browse files
authored
Merge pull request #52 from ToshY/feature/ffmpeg-7.1.1
bumped ffmpeg to 7.1.1
2 parents ada6c88 + 6e51c50 commit 3944a5c

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ COPY requirements.txt ./
3636
RUN pip install --no-cache-dir -r requirements.txt \
3737
&& pip install --no-cache-dir --upgrade --force-reinstall 'setuptools>=65.5.1'
3838

39-
FROM base as ffmpeg
39+
FROM base AS ffmpeg
4040

41-
COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/bin/
42-
COPY --from=mwader/static-ffmpeg:7.0.2 /ffprobe /usr/bin/
41+
COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/bin/
42+
COPY --from=mwader/static-ffmpeg:7.1.1 /ffprobe /usr/bin/
4343

4444
FROM ffmpeg AS prod
4545

Taskfile.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks:
2323
cmds:
2424
- for:
2525
var: TARGETS
26-
cmd: docker buildx build --target {{.ITEM}} --tag {{.IMAGE}}:{{.ITEM}} .
26+
cmd: docker buildx build --load --target {{.ITEM}} --tag {{.IMAGE}}:{{.ITEM}} .
2727

2828
down:
2929
desc: Down service
@@ -69,7 +69,7 @@ tasks:
6969
OUTPUT_DIRECTORY: '{{.o | default "output"}}'
7070
FONTS_DIRECTORY: '{{.o | default "fonts"}}'
7171
cmds:
72-
- docker buildx build --quiet --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} .
72+
- docker buildx build --quiet --load --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} .
7373
- mkdir -p ${PWD}/{{.INPUT_DIRECTORY}} ${PWD}/{{.OUTPUT_DIRECTORY}} ${PWD}/{{.FONTS_DIRECTORY}}
7474
- docker run -it -u $(id -u):$(id -g) -v ${PWD}/{{.INPUT_DIRECTORY}}:/app/input -v ${PWD}/{{.OUTPUT_DIRECTORY}}:/app/output -v ${PWD}/{{.FONTS_DIRECTORY}}:/app/fonts --rm {{.IMAGE}}:{{.TARGET}} {{.CLI_ARGS}}
7575

@@ -82,7 +82,7 @@ tasks:
8282
OUTPUT_DIRECTORY: '{{.o | default "output"}}'
8383
FONTS_DIRECTORY: '{{.o | default "fonts"}}'
8484
cmds:
85-
- docker buildx build --quiet --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} .
85+
- docker buildx build --quiet --load --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} .
8686
- mkdir -p ${PWD}/{{.INPUT_DIRECTORY}} ${PWD}/{{.OUTPUT_DIRECTORY}} ${PWD}/{{.FONTS_DIRECTORY}}
8787
- docker run -it --gpus all -u $(id -u):$(id -g) -v ${PWD}/{{.INPUT_DIRECTORY}}:/app/input -v ${PWD}/{{.OUTPUT_DIRECTORY}}:/app/output -v ${PWD}/{{.FONTS_DIRECTORY}}:/app/fonts --rm {{.IMAGE}}:{{.TARGET}} {{.CLI_ARGS}}
8888

0 commit comments

Comments
 (0)