Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit fcbcb3c

Browse filesBrowse files
author
Markus Perl
committed
Ubuntu 24.04 upgrade
1 parent 2ca2b9b commit fcbcb3c
Copy full SHA for fcbcb3c

File tree

Expand file treeCollapse file tree

4 files changed

+31
-40
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+31
-40
lines changed

‎.github/workflows/build.yml

Copy file name to clipboardExpand all lines: .github/workflows/build.yml
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
build-linux:
1212
name: build in native linux
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v4
@@ -59,19 +59,19 @@ jobs:
5959
6060
build-docker:
6161
name: build in docker
62-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6363
steps:
6464
- name: Checkout code
6565
uses: actions/checkout@v4
6666

6767
- name: pull base image
6868
id: ubuntu_pull
6969
run: |
70-
docker pull ubuntu:22.04
70+
docker pull ubuntu:24.04
7171
- name: run if ubuntu_pull failed
7272
if: failure() && steps.ubuntu_pull.outcome == 'failure'
7373
run: |
74-
docker pull ubuntu:22.04
74+
docker pull ubuntu:24.04
7575
- name: build ffmpeg
7676
run: |
7777
docker build -t ffmpeg:ubuntu -f Dockerfile .
@@ -89,12 +89,12 @@ jobs:
8989
- name: pull base image
9090
id: cuda_ubuntu_pull
9191
run: |
92-
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
92+
docker pull nvidia/cuda:12.6.2-devel-ubuntu22.04
9393
docker pull ubuntu:22.04
9494
- name: run if cuda_ubuntu_pull failed
9595
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
9696
run: |
97-
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
97+
docker pull nvidia/cuda:12.6.2-devel-ubuntu22.04
9898
docker pull ubuntu:22.04
9999
- name: build ffmpeg
100100
run: |
@@ -113,11 +113,11 @@ jobs:
113113
- name: pull base image
114114
id: cuda_ubuntu_pull
115115
run: |
116-
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
116+
docker pull nvidia/cuda:12.6.2-devel-ubuntu22.04
117117
- name: run if cuda_ubuntu_pull failed
118118
if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
119119
run: |
120-
docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
120+
docker pull nvidia/cuda:12.6.2-devel-ubuntu22.04
121121
- name: build ffmpeg
122122
run: |
123123
docker build -t ffmpeg:cuda-static -f full-static.dockerfile .

‎Dockerfile

Copy file name to clipboardExpand all lines: Dockerfile
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM ubuntu:22.04 AS build
1+
FROM ubuntu:24.04 AS build
22

3-
ENV DEBIAN_FRONTEND noninteractive
3+
ENV DEBIAN_FRONTEND=noninteractive
44

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

@@ -13,9 +13,9 @@ COPY ./build-ffmpeg /app/build-ffmpeg
1313

1414
RUN SKIPINSTALL=yes /app/build-ffmpeg --build
1515

16-
FROM ubuntu:22.04
16+
FROM ubuntu:24.04
1717

18-
ENV DEBIAN_FRONTEND noninteractive
18+
ENV DEBIAN_FRONTEND=noninteractive
1919

2020
# install va-driver
2121
RUN apt-get update \

‎cuda-ubuntu.dockerfile

Copy file name to clipboardExpand all lines: cuda-ubuntu.dockerfile
+17-26Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
ARG CUDAVER=12.2.2
1+
ARG CUDAVER=12.6.2
22
ARG UBUNTUVER=22.04
33

44
FROM nvidia/cuda:${CUDAVER}-devel-ubuntu${UBUNTUVER} AS build
55

6-
ENV DEBIAN_FRONTEND noninteractive
7-
ENV NVIDIA_VISIBLE_DEVICES all
8-
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
6+
ENV DEBIAN_FRONTEND=noninteractive
7+
ENV NVIDIA_VISIBLE_DEVICES=all
8+
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
99

10-
RUN apt-get update && \
11-
apt-get upgrade -y && \
12-
apt-get -y --no-install-recommends install \
13-
build-essential \
14-
curl \
15-
libva-dev \
16-
python3 \
17-
python-is-python3 \
18-
ninja-build \
19-
meson \
20-
cmake \
21-
git && \
22-
# clean
23-
apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
10+
RUN apt-get update \
11+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
12+
python3 python-is-python3 ninja-build meson git curl \
13+
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
14+
&& update-ca-certificates
2415

2516
# build and move deviceQuery to /usr/bin
2617
RUN mkdir -p /code && \
@@ -36,21 +27,21 @@ RUN CUDA_COMPUTE_CAPABILITY=$(deviceQuery | grep Capability | head -n 1 | awk 'E
3627

3728
FROM ubuntu:${UBUNTUVER} AS release
3829

39-
ENV DEBIAN_FRONTEND noninteractive
40-
ENV NVIDIA_VISIBLE_DEVICES all
41-
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
30+
ENV DEBIAN_FRONTEND=noninteractive
31+
ENV NVIDIA_VISIBLE_DEVICES=all
32+
ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,video
4233

4334
# install va-driver
4435
RUN apt-get update \
4536
&& apt-get -y install libva-drm2 \
4637
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
4738

4839
# Copy libnpp
49-
COPY --from=build /usr/local/cuda-12.2/targets/x86_64-linux/lib/libnppc.so /lib/x86_64-linux-gnu/libnppc.so.12
50-
COPY --from=build /usr/local/cuda-12.2/targets/x86_64-linux/lib/libnppig.so /lib/x86_64-linux-gnu/libnppig.so.12
51-
COPY --from=build /usr/local/cuda-12.2/targets/x86_64-linux/lib/libnppicc.so /lib/x86_64-linux-gnu/libnppicc.so.12
52-
COPY --from=build /usr/local/cuda-12.2/targets/x86_64-linux/lib/libnppidei.so /lib/x86_64-linux-gnu/libnppidei.so.12
53-
COPY --from=build /usr/local/cuda-12.2/targets/x86_64-linux/lib/libnppif.so /lib/x86_64-linux-gnu/libnppif.so.12
40+
COPY --from=build /usr/local/cuda-12.6/targets/x86_64-linux/lib/libnppc.so /lib/x86_64-linux-gnu/libnppc.so.12
41+
COPY --from=build /usr/local/cuda-12.6/targets/x86_64-linux/lib/libnppig.so /lib/x86_64-linux-gnu/libnppig.so.12
42+
COPY --from=build /usr/local/cuda-12.6/targets/x86_64-linux/lib/libnppicc.so /lib/x86_64-linux-gnu/libnppicc.so.12
43+
COPY --from=build /usr/local/cuda-12.6/targets/x86_64-linux/lib/libnppidei.so /lib/x86_64-linux-gnu/libnppidei.so.12
44+
COPY --from=build /usr/local/cuda-12.6/targets/x86_64-linux/lib/libnppif.so /lib/x86_64-linux-gnu/libnppif.so.12
5445

5546
# Copy ffmpeg
5647
COPY --from=build /app/workspace/bin/ffmpeg /usr/bin/ffmpeg

‎full-static.dockerfile

Copy file name to clipboardExpand all lines: full-static.dockerfile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04 AS build
1+
FROM ubuntu:24.04 AS build
22

33
ENV DEBIAN_FRONTEND=noninteractive
44
ENV NVIDIA_VISIBLE_DEVICES=all

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.