From e644fb5f1613cfb4a10c53d580c79f06ccd50c63 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 9 Feb 2022 22:46:00 +0100 Subject: [PATCH 1/3] 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. --- src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile | 13 ------------- 1 file changed, 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 From 6d2aa1894dee267dd0813ea27927f9f604dd445a Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Feb 2022 18:49:50 +0100 Subject: [PATCH 2/3] Update dist-armv7-linux to Ubuntu 20.04 --- .../docker/host-x86_64/dist-armv7-linux/Dockerfile | 13 ------------- 1 file changed, 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 From 2c8c4f1fbfe384f19663961096bbeb7a3be005e5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Thu, 10 Feb 2022 18:59:58 +0100 Subject: [PATCH 3/3] 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