Skip to content

Commit aca20bc

Browse files
committed
ubuntu fix
1 parent 3508d61 commit aca20bc

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
- name: Checkout code
1616
uses: actions/checkout@v2
1717

18-
- name: install libva-drm2
18+
- name: install libdrm-dev
1919
run: |
2020
sudo apt-get update
21-
sudo apt-get install -y libva-drm2
21+
sudo apt-get install -y libdrm-dev
2222
2323
- name: build ffmpeg
2424
run: |

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM ubuntu:20.04 AS build
22

3+
ENV DEBIAN_FRONTEND noninteractive
4+
35
RUN apt-get update \
4-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libdrm-dev \
6+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
57
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
68
&& update-ca-certificates
79

build-ffmpeg

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ mkdir -p "$PACKAGES"
220220
mkdir -p "$WORKSPACE"
221221

222222
export PATH="${WORKSPACE}/bin:$PATH"
223-
export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig"
223+
PKG_CONFIG_PATH="/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib/pkgconfig"
224+
PKG_CONFIG_PATH+=":/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig"
225+
export PKG_CONFIG_PATH
224226

225227
if ! command_exists "make"; then
226228
echo "make not installed.";

cuda-ubuntu.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
66
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
77

88
RUN apt-get update \
9-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libdrm-dev \
9+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
1010
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
1111
&& update-ca-certificates
1212

full-static.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
FROM nvidia/cuda:11.1-devel-ubuntu20.04 AS build
22

3+
ENV DEBIAN_FRONTEND noninteractive
34
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
45

56
RUN apt-get update \
6-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates python3 \
7+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates \
78
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
89
&& update-ca-certificates
910

0 commit comments

Comments
 (0)