Skip to content

Update Dockerfiles with more improvements #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 20, 2021
Merged

Update Dockerfiles with more improvements #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ jobs:
- name: pull base image
id: cuda_ubuntu_pull
run: |
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
docker pull ubuntu:20.04
- name: run if cuda_ubuntu_pull failed
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
run: |
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
docker pull ubuntu:20.04
- name: build ffmpeg
run: |
Expand All @@ -113,12 +113,12 @@ jobs:
- name: pull base image
id: cuda_centos_pull
run: |
docker pull nvidia/cuda:11.1-devel-centos8
docker pull nvidia/cuda:11.4.2-devel-centos8
docker pull centos:8
- name: run if cuda_centos_pull failed
if: failure() && steps.cuda_centos_pull.outcome == 'failure'
run: |
docker pull nvidia/cuda:11.1-devel-centos8
docker pull nvidia/cuda:11.4.2-devel-centos8
docker pull centos:8
- name: build ffmpeg
run: |
Expand All @@ -137,11 +137,11 @@ jobs:
- name: pull base image
id: cuda_ubuntu_pull
run: |
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
- name: run if cuda_ubuntu_pull failed
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
run: |
docker pull nvidia/cuda:11.1-devel-ubuntu20.04
docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
- name: build ffmpeg
run: |
docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM ubuntu:20.04 AS build
ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update \
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python \
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
python3 python-is-python3 ninja-build meson \
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
&& update-ca-certificates

Expand Down Expand Up @@ -32,4 +33,4 @@ RUN ldd /usr/bin/ffprobe
RUN ldd /usr/bin/ffplay

CMD ["--help"]
ENTRYPOINT ["/usr/bin/ffmpeg"]
ENTRYPOINT ["/usr/bin/ffmpeg"]
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ $ ./build-ffmpeg --build
* `libsvtav1`: SVT-AV1 Encoder and Decoder
* `aom`: AV1 Video Codec (Experimental and very slow!)
* `librav1e`: rust based AV1 encoder (only available if [`cargo` is installed](https://doc.rust-lang.org/cargo/getting-started/installation.html))
* `libdav1d`: Fastest AV1 decoder developed by the VideoLAN and FFmpeg communities and sponsored by the AOMedia (only available if `meson` and `ninja` are installed)
* `fdk_aac`: Fraunhofer FDK AAC Codec
* `xvidcore`: MPEG-4 video coding standard
* `VP8/VP9/webm`: VP8 / VP9 Video Codec for the WebM video file format
Expand Down
Loading