From 2c8c4f1fbfe384f19663961096bbeb7a3be005e5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Feb 2022 18:59:58 +0100 Subject: [PATCH] Update dist-armhf-linux to Ubuntu 20.04 --- .../docker/host-x86_64/dist-armhf-linux/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile index b11a1d3feb2..dd1c83b4132 100644 --- a/src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-armhf-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