Skip to content

Commit

Permalink
Ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
Markus Perl committed Nov 26, 2024
1 parent 2ca2b9b commit 043498b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -59,19 +59,19 @@ 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

- 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 .
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04 AS build
FROM ubuntu:24.04 AS build

ENV DEBIAN_FRONTEND noninteractive

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cuda-ubuntu.dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion full-static.dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 043498b

Please sign in to comment.