From: Matthias Krüger Date: Thu, 17 Feb 2022 05:30:05 +0000 (+0100) Subject: Rollup merge of #94064 - nikic:update-musl-image, r=Mark-Simulacrum X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=aa83189caa910fe8d4bc2415438d9168132b2295;hp=91f70a8fdf3f39895d72d0b117722cff141015cf;p=rust.git Rollup merge of #94064 - nikic:update-musl-image, r=Mark-Simulacrum Update dist-x86_64-musl to Ubuntu 20.04 This updates the dist-x86_64-musl image to use Ubuntu 20.04. The current Ubuntu 16.04 based image only works due to the Docker cache, it's not possible anymore to run it locally because of the usual certificate expiration issue. I believe updating the OS here is relatively safe because this targets musl, so there are no concerns about raising the glibc baseline. There is some risk here in that it updates the compiler toolchain used to produce artifacts, though I'm not aware of any specific issues that could cause. r? ``@Mark-Simulacrum`` --- 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 ef49904b53d..51645a81853 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,6 @@ -FROM ubuntu:16.04 +FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ g++ \ make \ ninja-build \