Skip to content

Commit

Permalink
Rollup merge of #94064 - nikic:update-musl-image, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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`
  • Loading branch information
matthiaskrgr authored Feb 16, 2022
2 parents 493d7af + 8630085 commit d0961c3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ci/docker/host-x86_64/dist-x86_64-musl/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down

0 comments on commit d0961c3

Please sign in to comment.