diff --git a/Dockerfile b/Dockerfile index 30de372..8d36623 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,10 +36,10 @@ COPY requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt \ && pip install --no-cache-dir --upgrade --force-reinstall 'setuptools>=65.5.1' -FROM base as ffmpeg +FROM base AS ffmpeg -COPY --from=mwader/static-ffmpeg:7.0.2 /ffmpeg /usr/bin/ -COPY --from=mwader/static-ffmpeg:7.0.2 /ffprobe /usr/bin/ +COPY --from=mwader/static-ffmpeg:7.1.1 /ffmpeg /usr/bin/ +COPY --from=mwader/static-ffmpeg:7.1.1 /ffprobe /usr/bin/ FROM ffmpeg AS prod diff --git a/Taskfile.yml b/Taskfile.yml index a081c5e..5cb6227 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -23,7 +23,7 @@ tasks: cmds: - for: var: TARGETS - cmd: docker buildx build --target {{.ITEM}} --tag {{.IMAGE}}:{{.ITEM}} . + cmd: docker buildx build --load --target {{.ITEM}} --tag {{.IMAGE}}:{{.ITEM}} . down: desc: Down service @@ -69,7 +69,7 @@ tasks: OUTPUT_DIRECTORY: '{{.o | default "output"}}' FONTS_DIRECTORY: '{{.o | default "fonts"}}' cmds: - - docker buildx build --quiet --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} . + - docker buildx build --quiet --load --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} . - mkdir -p ${PWD}/{{.INPUT_DIRECTORY}} ${PWD}/{{.OUTPUT_DIRECTORY}} ${PWD}/{{.FONTS_DIRECTORY}} - 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}} @@ -82,7 +82,7 @@ tasks: OUTPUT_DIRECTORY: '{{.o | default "output"}}' FONTS_DIRECTORY: '{{.o | default "fonts"}}' cmds: - - docker buildx build --quiet --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} . + - docker buildx build --quiet --load --target {{.TARGET}} --tag {{.IMAGE}}:{{.TARGET}} . - mkdir -p ${PWD}/{{.INPUT_DIRECTORY}} ${PWD}/{{.OUTPUT_DIRECTORY}} ${PWD}/{{.FONTS_DIRECTORY}} - 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}}