From 9830960c19c53b1527593413e0f55c8cfb067344 Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Wed, 20 Nov 2024 01:30:12 -0500 Subject: [PATCH] ci: Change 32-bit Docker images to use EOL repos --- ci/docker/arm-unknown-linux-gnueabihf/Dockerfile | 10 +++++++--- ci/docker/arm-unknown-linux-musleabihf/Dockerfile | 9 ++++++--- ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile | 5 ++++- ci/docker/i686-unknown-linux-gnu/Dockerfile | 11 ++++++++--- ci/docker/i686-unknown-linux-musl/Dockerfile | 11 +++++++---- ci/docker/powerpc-unknown-linux-gnu/Dockerfile | 5 ++++- 6 files changed, 36 insertions(+), 15 deletions(-) diff --git a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile index 977acabf4b6ba..8f2d3ea80d065 100644 --- a/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile +++ b/ci/docker/arm-unknown-linux-gnueabihf/Dockerfile @@ -1,7 +1,11 @@ FROM ubuntu:23.10 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc libc6-dev ca-certificates \ - gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user + +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends \ + gcc libc6-dev ca-certificates \ + gcc-arm-linux-gnueabihf libc6-dev-armhf-cross qemu-user ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \ CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \ PATH=$PATH:/rust/bin diff --git a/ci/docker/arm-unknown-linux-musleabihf/Dockerfile b/ci/docker/arm-unknown-linux-musleabihf/Dockerfile index 1709699997e7f..f8a5d27df3b5f 100644 --- a/ci/docker/arm-unknown-linux-musleabihf/Dockerfile +++ b/ci/docker/arm-unknown-linux-musleabihf/Dockerfile @@ -1,8 +1,11 @@ FROM ubuntu:23.10 -RUN apt-get update && apt-get install -y --no-install-recommends \ - gcc make libc6-dev git curl ca-certificates \ - gcc-arm-linux-gnueabihf qemu-user +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends \ + gcc make libc6-dev git curl ca-certificates \ + gcc-arm-linux-gnueabihf qemu-user COPY install-musl.sh / RUN sh /install-musl.sh arm diff --git a/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile b/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile index 585fdc35ff542..330493f54a1d1 100644 --- a/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile +++ b/ci/docker/armv7-unknown-linux-uclibceabihf/Dockerfile @@ -1,6 +1,9 @@ FROM ubuntu:23.10 -RUN apt-get update && apt-get install -y --no-install-recommends \ +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends \ gcc libc6-dev qemu-user ca-certificates qemu-system-arm curl \ xz-utils patch file diff --git a/ci/docker/i686-unknown-linux-gnu/Dockerfile b/ci/docker/i686-unknown-linux-gnu/Dockerfile index 6cdc1942c50c7..fae0b566d33fc 100644 --- a/ci/docker/i686-unknown-linux-gnu/Dockerfile +++ b/ci/docker/i686-unknown-linux-gnu/Dockerfile @@ -1,5 +1,10 @@ FROM ubuntu:23.10 -RUN apt-get update -RUN apt-get install -y --no-install-recommends \ - gcc-multilib libc6-dev ca-certificates + + +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends \ + gcc-multilib libc6-dev ca-certificates + ENV PATH=$PATH:/rust/bin diff --git a/ci/docker/i686-unknown-linux-musl/Dockerfile b/ci/docker/i686-unknown-linux-musl/Dockerfile index a54456fd9942b..4f36d2075485c 100644 --- a/ci/docker/i686-unknown-linux-musl/Dockerfile +++ b/ci/docker/i686-unknown-linux-musl/Dockerfile @@ -1,9 +1,12 @@ FROM ubuntu:23.10 -RUN dpkg --add-architecture i386 -RUN apt-get update -RUN apt-get install -y --no-install-recommends \ - gcc-multilib make libc6-dev git curl ca-certificates libc6-i386 + +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + dpkg --add-architecture i386 && \ + apt-get update && apt-get install -y --no-install-recommends \ + gcc-multilib make libc6-dev git curl ca-certificates libc6-i386 COPY install-musl.sh / RUN sh /install-musl.sh i686 diff --git a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile index 930f0375db219..535202951d2ce 100644 --- a/ci/docker/powerpc-unknown-linux-gnu/Dockerfile +++ b/ci/docker/powerpc-unknown-linux-gnu/Dockerfile @@ -1,6 +1,9 @@ FROM ubuntu:23.10 -RUN apt-get update && apt-get install -y --no-install-recommends \ +# FIXME(time): we are using an EOL release because 24.04 changes to 64-bit time +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \ + /etc/apt/sources.list && \ + apt-get update && apt-get install -y --no-install-recommends \ gcc libc6-dev qemu-user ca-certificates \ gcc-powerpc-linux-gnu libc6-dev-powerpc-cross \ qemu-system-ppc