File tree 6 files changed +14
-23
lines changed
6 files changed +14
-23
lines changed Original file line number Diff line number Diff line change 1
1
# !/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
5
5
ARCH =amd64
6
6
.PHONY : Dockerfile
7
7
Dockerfile : Dockerfile.in
Original file line number Diff line number Diff line change 1
1
# !/usr/bin/make
2
- DISTRO =ubuntu:mantic
2
+ DISTRO =ubuntu:noble
3
3
.PHONY : Dockerfile
4
4
Dockerfile : Dockerfile.win64.in
5
5
sed ' s/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@
Original file line number Diff line number Diff line change @@ -9,8 +9,7 @@ usage() {
9
9
echo -e " * bookworm * arm64"
10
10
echo -e " * focal"
11
11
echo -e " * jammy"
12
- echo -e " * lunar"
13
- echo -e " * mantic"
12
+ echo -e " * noble"
14
13
}
15
14
16
15
if [[ -z ${1} ]]; then
@@ -28,12 +27,12 @@ case ${cli_release} in
28
27
' bullseye' )
29
28
release=" debian:bullseye"
30
29
gcc_version=" 10"
31
- llvm_version=" 13 "
30
+ llvm_version=" 16 "
32
31
;;
33
32
' bookworm' )
34
33
release=" debian:bookworm"
35
34
gcc_version=" 12"
36
- llvm_version=" 15 "
35
+ llvm_version=" 16 "
37
36
;;
38
37
' focal' )
39
38
release=" ubuntu:focal"
@@ -45,13 +44,8 @@ case ${cli_release} in
45
44
gcc_version=" 11"
46
45
llvm_version=" 15"
47
46
;;
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"
55
49
gcc_version=" 13"
56
50
llvm_version=" 17"
57
51
;;
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ for dep in docker make; do
9
9
done
10
10
11
11
# Use the latest distro for toolchains
12
- distro=" ubuntu:mantic "
12
+ distro=" ubuntu:noble "
13
13
image_name=" jellyfin-ffmpeg-build-windows-win64"
14
14
package_temporary_dir=" $( mktemp -d ) "
15
15
current_user=" $( whoami ) "
Original file line number Diff line number Diff line change @@ -18,9 +18,6 @@ packages:
18
18
- jammy-amd64
19
19
- jammy-armhf
20
20
- 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
Original file line number Diff line number Diff line change 1
- FROM ubuntu:mantic
1
+ FROM ubuntu:noble
2
2
3
3
ENV DEBIAN_FRONTEND noninteractive
4
4
RUN \
You can’t perform that action at this time.
0 commit comments