Skip to content

Commit ee1dd5f

Browse files
committed
Add support for Ubuntu 24.04 LTS (Noble)
Signed-off-by: nyanmisaka <[email protected]>
1 parent 202de8d commit ee1dd5f

File tree

6 files changed

+14
-23
lines changed

6 files changed

+14
-23
lines changed

Dockerfile.make

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/make
2-
DISTRO=bullseye
3-
GCC_VER=10
4-
LLVM_VER=13
2+
DISTRO=noble
3+
GCC_VER=13
4+
LLVM_VER=17
55
ARCH=amd64
66
.PHONY: Dockerfile
77
Dockerfile: Dockerfile.in

Dockerfile.win64.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/make
2-
DISTRO=ubuntu:mantic
2+
DISTRO=ubuntu:noble
33
.PHONY: Dockerfile
44
Dockerfile: Dockerfile.win64.in
55
sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@

build

+5-11
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ usage() {
99
echo -e " * bookworm * arm64"
1010
echo -e " * focal"
1111
echo -e " * jammy"
12-
echo -e " * lunar"
13-
echo -e " * mantic"
12+
echo -e " * noble"
1413
}
1514

1615
if [[ -z ${1} ]]; then
@@ -28,12 +27,12 @@ case ${cli_release} in
2827
'bullseye')
2928
release="debian:bullseye"
3029
gcc_version="10"
31-
llvm_version="13"
30+
llvm_version="16"
3231
;;
3332
'bookworm')
3433
release="debian:bookworm"
3534
gcc_version="12"
36-
llvm_version="15"
35+
llvm_version="16"
3736
;;
3837
'focal')
3938
release="ubuntu:focal"
@@ -45,13 +44,8 @@ case ${cli_release} in
4544
gcc_version="11"
4645
llvm_version="15"
4746
;;
48-
'lunar')
49-
release="ubuntu:lunar"
50-
gcc_version="12"
51-
llvm_version="15"
52-
;;
53-
'mantic')
54-
release="ubuntu:mantic"
47+
'noble')
48+
release="ubuntu:noble"
5549
gcc_version="13"
5650
llvm_version="17"
5751
;;

build-windows-win64

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for dep in docker make; do
99
done
1010

1111
# Use the latest distro for toolchains
12-
distro="ubuntu:mantic"
12+
distro="ubuntu:noble"
1313
image_name="jellyfin-ffmpeg-build-windows-win64"
1414
package_temporary_dir="$( mktemp -d )"
1515
current_user="$( whoami )"

build.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ packages:
1818
- jammy-amd64
1919
- jammy-armhf
2020
- jammy-arm64
21-
- lunar-amd64
22-
- lunar-armhf
23-
- lunar-arm64
24-
- mantic-amd64
25-
- mantic-armhf
26-
- mantic-arm64
21+
- noble-amd64
22+
- noble-armhf
23+
- noble-arm64

builder/images/base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:mantic
1+
FROM ubuntu:noble
22

33
ENV DEBIAN_FRONTEND noninteractive
44
RUN \

0 commit comments

Comments
 (0)