about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2022-02-10 18:49:50 +0100
committerNikita Popov <nikita.ppv@gmail.com>2022-02-10 18:49:50 +0100
commit6d2aa1894dee267dd0813ea27927f9f604dd445a (patch)
tree672a05535bad229de56291ac1e742f5a67cb28c7 /src/ci
parente644fb5f1613cfb4a10c53d580c79f06ccd50c63 (diff)
downloadrust-6d2aa1894dee267dd0813ea27927f9f604dd445a.tar.gz
rust-6d2aa1894dee267dd0813ea27927f9f604dd445a.zip
Update dist-armv7-linux to Ubuntu 20.04
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
index 55ca23b293d..32e3bc22ad7 100644
--- a/src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-armv7-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