diff options
| author | Josh Stone <jistone@redhat.com> | 2023-07-20 16:08:41 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2023-07-21 12:22:25 -0700 |
| commit | a82fa0d1c719a3ec42aaa76d0a5aba3703014322 (patch) | |
| tree | 51d490395e18a5d425ebcd70e39c5c85600e0c7b | |
| parent | 69d56abfbdbbf00e9c7bc0992b1b8de7d8aaf330 (diff) | |
| download | rust-a82fa0d1c719a3ec42aaa76d0a5aba3703014322.tar.gz rust-a82fa0d1c719a3ec42aaa76d0a5aba3703014322.zip | |
ci: Update dist-x86_64-musl to ubuntu:22.04
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile index 6f04dcad9a5..c9a6a2dd069 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile @@ -1,6 +1,7 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ g++ \ make \ ninja-build \ @@ -11,6 +12,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins python3 \ git \ cmake \ + bzip2 \ xz-utils \ sudo \ gdb \ @@ -21,10 +23,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins WORKDIR /build/ -# Build cmake before musl toolchain, as we replace the compiler during that step. -COPY scripts/cmake.sh /scripts/ -RUN /scripts/cmake.sh - COPY scripts/musl-toolchain.sh /build/ # We need to mitigate rust-lang/rust#34978 when compiling musl itself as well RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \ |