Skip to content

Commit 96ffc1e

Browse files
committed
ci: Change 32-bit Docker images to use EOL repos
(backport <rust-lang#4120>) (cherry picked from commit 9830960)
1 parent 09b8ed6 commit 96ffc1e

File tree

6 files changed

+36
-15
lines changed

6 files changed

+36
-15
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
FROM ubuntu:23.10
2-
RUN apt-get update && apt-get install -y --no-install-recommends \
3-
gcc libc6-dev ca-certificates \
4-
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
2+
3+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
4+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
5+
/etc/apt/sources.list && \
6+
apt-get update && apt-get install -y --no-install-recommends \
7+
gcc libc6-dev ca-certificates \
8+
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user
59
ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
610
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
711
PATH=$PATH:/rust/bin

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
FROM ubuntu:23.10
22

3-
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
gcc make libc6-dev git curl ca-certificates \
5-
gcc-arm-linux-gnueabihf qemu-user
3+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
4+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
5+
/etc/apt/sources.list && \
6+
apt-get update && apt-get install -y --no-install-recommends \
7+
gcc make libc6-dev git curl ca-certificates \
8+
gcc-arm-linux-gnueabihf qemu-user
69

710
COPY install-musl.sh /
811
RUN sh /install-musl.sh arm

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

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

3-
RUN apt-get update && apt-get install -y --no-install-recommends \
3+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
4+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
5+
/etc/apt/sources.list && \
6+
apt-get update && apt-get install -y --no-install-recommends \
47
gcc libc6-dev qemu-user ca-certificates qemu-system-arm curl \
58
xz-utils patch file
69

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
FROM ubuntu:23.10
2-
RUN apt-get update
3-
RUN apt-get install -y --no-install-recommends \
4-
gcc-multilib libc6-dev ca-certificates
2+
3+
4+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
5+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
6+
/etc/apt/sources.list && \
7+
apt-get update && apt-get install -y --no-install-recommends \
8+
gcc-multilib libc6-dev ca-certificates
9+
510
ENV PATH=$PATH:/rust/bin

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
FROM ubuntu:23.10
22

3-
RUN dpkg --add-architecture i386
4-
RUN apt-get update
5-
RUN apt-get install -y --no-install-recommends \
6-
gcc-multilib make libc6-dev git curl ca-certificates libc6-i386
3+
4+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
5+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
6+
/etc/apt/sources.list && \
7+
dpkg --add-architecture i386 && \
8+
apt-get update && apt-get install -y --no-install-recommends \
9+
gcc-multilib make libc6-dev git curl ca-certificates libc6-i386
710

811
COPY install-musl.sh /
912
RUN sh /install-musl.sh i686

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

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

3-
RUN apt-get update && apt-get install -y --no-install-recommends \
3+
# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time
4+
RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
5+
/etc/apt/sources.list && \
6+
apt-get update && apt-get install -y --no-install-recommends \
47
gcc libc6-dev qemu-user ca-certificates \
58
gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \
69
qemu-system-ppc

0 commit comments

Comments
 (0)