Skip to content

Commit 09b8ed6

Browse files
committed
ci: Change 64-bit Docker images to ubuntu:24.10
23.10 is EOL so update to the latest stable version. This change excludes sparc which is stuck on an older version. (backport <rust-lang#4120>) (cherry picked from commit 0c9abef)
1 parent bbf696c commit 09b8ed6

File tree

20 files changed

+23
-26
lines changed

20 files changed

+23
-26
lines changed

ci/docker/aarch64-linux-android/Dockerfile

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

33
RUN dpkg --add-architecture i386
44
RUN apt-get update
@@ -8,7 +8,6 @@ RUN apt-get install -y --no-install-recommends \
88
wget \
99
ca-certificates \
1010
python3 \
11-
python3-distutils \
1211
unzip \
1312
expect \
1413
openjdk-8-jre \

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.10
2+
23
RUN apt-get update && apt-get install -y --no-install-recommends \
34
gcc libc6-dev ca-certificates \
45
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:23.10
1+
FROM ubuntu:24.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-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.10
22

33
RUN dpkg --add-architecture i386
44
RUN apt-get update
@@ -8,7 +8,6 @@ RUN apt-get install -y --no-install-recommends \
88
wget \
99
ca-certificates \
1010
python3 \
11-
python3-distutils \
1211
unzip \
1312
expect \
1413
openjdk-8-jre \

ci/docker/asmjs-unknown-emscripten/Dockerfile

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

33
# This is a workaround to avoid the interaction with tzdata.
44
ENV DEBIAN_FRONTEND=noninteractive
@@ -14,7 +14,6 @@ RUN apt-get install -y --no-install-recommends \
1414
libc6-dev \
1515
libxml2 \
1616
python3 \
17-
python3-distutils \
1817
xz-utils \
1918
bzip2
2019

ci/docker/i686-linux-android/Dockerfile

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

33
RUN dpkg --add-architecture i386
44
RUN apt-get update
@@ -8,7 +8,6 @@ RUN apt-get install -y --no-install-recommends \
88
wget \
99
ca-certificates \
1010
python3 \
11-
python3-distutils \
1211
unzip \
1312
expect \
1413
openjdk-8-jre \

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:24.10
22

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:24.10
22

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

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.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:23.10
1+
FROM ubuntu:24.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:23.10
1+
FROM ubuntu:24.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:23.10
1+
FROM ubuntu:24.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:23.10
1+
FROM ubuntu:24.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-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.10
22

33
# This is a workaround to avoid the interaction with tzdata.
44
ENV DEBIAN_FRONTEND=noninteractive
@@ -17,7 +17,6 @@ RUN apt-get install -y --no-install-recommends \
1717
libc6-dev \
1818
libxml2 \
1919
python3 \
20-
python3-distutils \
2120
cmake \
2221
sudo \
2322
gdb \

ci/docker/wasm32-wasip1/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:24.10
22

33
COPY wasi.sh /
44
RUN bash /wasi.sh

ci/docker/wasm32-wasip2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:24.10
22

33
COPY wasi.sh /
44
RUN bash /wasi.sh

ci/docker/x86_64-linux-android/Dockerfile

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

33
RUN apt-get update && \
44
apt-get install -y --no-install-recommends \
@@ -7,7 +7,6 @@ RUN apt-get update && \
77
gcc \
88
libc-dev \
99
python3 \
10-
python3-distutils \
1110
unzip
1211

1312
WORKDIR /android/

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.10
2+
23
RUN apt-get update
34
RUN apt-get install -y --no-install-recommends \
45
gcc libc6-dev ca-certificates linux-headers-generic

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM ubuntu:23.10
1+
FROM ubuntu:24.10
2+
23
RUN apt-get update
34
RUN apt-get install -y --no-install-recommends \
45
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:23.10
1+
FROM ubuntu:24.10
22

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

0 commit comments

Comments
 (0)