Skip to content

Commit 00f48a6

Browse files
committed
Auto merge of #3418 - JohnTitor:Mantic-Minotaurgha, r=JohnTitor
Upgrade Docker images to Ubuntu 23.10
2 parents 8498879 + 946c348 commit 00f48a6

File tree

33 files changed

+42
-32
lines changed

33 files changed

+42
-32
lines changed

ci/docker/aarch64-linux-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

ci/docker/aarch64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc libc6-dev ca-certificates \
44
gcc-aarch64-linux-gnu libc6-dev-arm64-cross qemu-user

ci/docker/aarch64-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/arm-linux-androideabi/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

ci/docker/arm-unknown-linux-gnueabihf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22
RUN apt-get update && apt-get install -y --no-install-recommends \
33
gcc libc6-dev ca-certificates \
44
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-arm curl \

ci/docker/asmjs-unknown-emscripten/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
# This is a workaround to avoid the interaction with tzdata.
44
ENV DEBIAN_FRONTEND=noninteractive

ci/docker/i686-linux-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

ci/docker/i686-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc-multilib libc6-dev ca-certificates

ci/docker/i686-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update

ci/docker/mips-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mips curl \

ci/docker/mips64-unknown-linux-gnuabi64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips64-unknown-linux-muslabi64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/mips64el-unknown-linux-gnuabi64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/mips64el-unknown-linux-muslabi64/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \

ci/docker/mipsel-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mipsel curl \

ci/docker/mipsel-unknown-linux-uclibc/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates qemu-system-mipsel curl \

ci/docker/powerpc-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/powerpc64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/powerpc64le-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc libc6-dev qemu-user ca-certificates \

ci/docker/s390x-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \

ci/docker/s390x-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \

ci/docker/sparc64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
curl ca-certificates \

ci/docker/wasm32-unknown-emscripten/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
# This is a workaround to avoid the interaction with tzdata.
44
ENV DEBIAN_FRONTEND=noninteractive

ci/docker/wasm32-wasi/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

ci/docker/x86_64-linux-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \

ci/docker/x86_64-unknown-linux-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc libc6-dev ca-certificates linux-headers-generic

ci/docker/x86_64-unknown-linux-gnux32/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22
RUN apt-get update
33
RUN apt-get install -y --no-install-recommends \
44
gcc-multilib libc6-dev ca-certificates

ci/docker/x86_64-unknown-linux-musl/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:23.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \

libc-test/build.rs

+10
Original file line numberDiff line numberDiff line change
@@ -3589,6 +3589,10 @@ fn test_linux(target: &str) {
35893589

35903590
// FIXME: requires >= 6.1 kernel headers
35913591
"canxl_frame" => true,
3592+
3593+
// FIXME: The size of `iv` has been changed since Linux v6.0
3594+
// https://github.com/torvalds/linux/commit/94dfc73e7cf4a31da66b8843f0b9283ddd6b8381
3595+
"af_alg_iv" => true,
35923596
_ => false,
35933597
}
35943598
});
@@ -3907,6 +3911,9 @@ fn test_linux(target: &str) {
39073911
| "FAN_EPIDFD"
39083912
if musl => true,
39093913

3914+
// FIXME: Requires linux 6.5
3915+
"NFT_MSG_MAX" => true,
3916+
39103917
_ => false,
39113918
}
39123919
});
@@ -4013,6 +4020,9 @@ fn test_linux(target: &str) {
40134020
"posix_basename" if gnu => true,
40144021
"gnu_basename" if gnu => true,
40154022

4023+
// FIXME: function pointers changed since Ubuntu 23.10
4024+
"strtol" | "strtoll" | "strtoul" | "strtoull" | "fscanf" | "scanf" | "sscanf" => true,
4025+
40164026
_ => false,
40174027
}
40184028
});

0 commit comments

Comments
 (0)