diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2022-02-09 22:46:00 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2022-02-09 23:28:39 +0100 |
| commit | e644fb5f1613cfb4a10c53d580c79f06ccd50c63 (patch) | |
| tree | 8227bc64e56497567204c3319eb035c63331595c /src/ci | |
| parent | f624427f8771c00819684c783bb841bf72095704 (diff) | |
| download | rust-e644fb5f1613cfb4a10c53d580c79f06ccd50c63.tar.gz rust-e644fb5f1613cfb4a10c53d580c79f06ccd50c63.zip | |
Update dist-arm-linux to Ubuntu 20.04
I believe this should be safe, as actual artifacts will be produced by a cross toolchain. The build ran through cleanly locally.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile index ee4fd759b46..79c2c1d93d7 100644 --- a/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile @@ -1,17 +1,4 @@ FROM ubuntu:20.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - curl \ - ca-certificates -WORKDIR /tmp -RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem - -FROM ubuntu:16.04 - -# The ca-certificates in ubuntu-16 is too old, so update the certificates -# with something more recent. -COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem -ENV CURL_CA_BUNDLE /tmp/cacert.pem COPY scripts/cross-apt-packages.sh /scripts/ RUN sh /scripts/cross-apt-packages.sh |