From 043498b0d1df3e9e2c398dbbeea5d8a9534eedc3 Mon Sep 17 00:00:00 2001 From: Markus Perl Date: Tue, 26 Nov 2024 10:52:46 +0100 Subject: [PATCH] Ubuntu 24.04 --- .github/workflows/build.yml | 8 ++++---- Dockerfile | 4 ++-- cuda-ubuntu.dockerfile | 2 +- full-static.dockerfile | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5935084..47ad2ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: build-linux: name: build in native linux - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code uses: actions/checkout@v4 @@ -59,7 +59,7 @@ jobs: build-docker: name: build in docker - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code uses: actions/checkout@v4 @@ -67,11 +67,11 @@ jobs: - name: pull base image id: ubuntu_pull run: | - docker pull ubuntu:22.04 + docker pull ubuntu:24.04 - name: run if ubuntu_pull failed if: failure() && steps.ubuntu_pull.outcome == 'failure' run: | - docker pull ubuntu:22.04 + docker pull ubuntu:24.04 - name: build ffmpeg run: | docker build -t ffmpeg:ubuntu -f Dockerfile . diff --git a/Dockerfile b/Dockerfile index 933104b..fb557f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS build +FROM ubuntu:24.04 AS build ENV DEBIAN_FRONTEND noninteractive @@ -13,7 +13,7 @@ COPY ./build-ffmpeg /app/build-ffmpeg RUN SKIPINSTALL=yes /app/build-ffmpeg --build -FROM ubuntu:22.04 +FROM ubuntu:24.04 ENV DEBIAN_FRONTEND noninteractive diff --git a/cuda-ubuntu.dockerfile b/cuda-ubuntu.dockerfile index 1355b21..28337d5 100644 --- a/cuda-ubuntu.dockerfile +++ b/cuda-ubuntu.dockerfile @@ -1,5 +1,5 @@ ARG CUDAVER=12.2.2 -ARG UBUNTUVER=22.04 +ARG UBUNTUVER=24.04 FROM nvidia/cuda:${CUDAVER}-devel-ubuntu${UBUNTUVER} AS build diff --git a/full-static.dockerfile b/full-static.dockerfile index 2191f7f..26f016b 100644 --- a/full-static.dockerfile +++ b/full-static.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS build +FROM ubuntu:24.04 AS build ENV DEBIAN_FRONTEND=noninteractive ENV NVIDIA_VISIBLE_DEVICES=all