Skip to content

Commit da9f1ee

Browse files
authored
Rollup merge of rust-lang#90550 - ehuss:update-ca, r=Mark-Simulacrum
Update certificates in some Ubuntu 16 images. These images use crosstool-ng, which needs to download various things off the internet. The certificate for `www.kernel.org` no longer works with the ca-certificates in Ubuntu 16. This resolves the issue by grabbing from a newer image a certificate bundle from https://curl.se/ca/cacert.pem, which is usually somewhat up to date.
2 parents 7379ca9 + 951dad6 commit da9f1ee

File tree

4 files changed

+52
-0
lines changed

4 files changed

+52
-0
lines changed

src/ci/docker/host-x86_64/dist-aarch64-linux/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1+
FROM ubuntu:20.04
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates
6+
WORKDIR /tmp
7+
RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem
8+
19
FROM ubuntu:16.04
210

11+
# The ca-certificates in ubuntu-16 is too old, so update the certificates
12+
# with something more recent.
13+
COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem
14+
ENV CURL_CA_BUNDLE /tmp/cacert.pem
15+
316
COPY scripts/cross-apt-packages.sh /scripts/
417
RUN sh /scripts/cross-apt-packages.sh
518

src/ci/docker/host-x86_64/dist-arm-linux/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1+
FROM ubuntu:20.04
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates
6+
WORKDIR /tmp
7+
RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem
8+
19
FROM ubuntu:16.04
210

11+
# The ca-certificates in ubuntu-16 is too old, so update the certificates
12+
# with something more recent.
13+
COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem
14+
ENV CURL_CA_BUNDLE /tmp/cacert.pem
15+
316
COPY scripts/cross-apt-packages.sh /scripts/
417
RUN sh /scripts/cross-apt-packages.sh
518

src/ci/docker/host-x86_64/dist-armhf-linux/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1+
FROM ubuntu:20.04
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates
6+
WORKDIR /tmp
7+
RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem
8+
19
FROM ubuntu:16.04
210

11+
# The ca-certificates in ubuntu-16 is too old, so update the certificates
12+
# with something more recent.
13+
COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem
14+
ENV CURL_CA_BUNDLE /tmp/cacert.pem
15+
316
COPY scripts/cross-apt-packages.sh /scripts/
417
RUN sh /scripts/cross-apt-packages.sh
518

src/ci/docker/host-x86_64/dist-armv7-linux/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1+
FROM ubuntu:20.04
2+
RUN apt-get update && \
3+
apt-get install -y --no-install-recommends \
4+
curl \
5+
ca-certificates
6+
WORKDIR /tmp
7+
RUN curl -f https://curl.se/ca/cacert.pem -o cacert.pem
8+
19
FROM ubuntu:16.04
210

11+
# The ca-certificates in ubuntu-16 is too old, so update the certificates
12+
# with something more recent.
13+
COPY --from=0 /tmp/cacert.pem /tmp/cacert.pem
14+
ENV CURL_CA_BUNDLE /tmp/cacert.pem
15+
316
COPY scripts/cross-apt-packages.sh /scripts/
417
RUN sh /scripts/cross-apt-packages.sh
518

0 commit comments

Comments
 (0)