diff options
| author | bors <bors@rust-lang.org> | 2024-06-15 22:54:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-15 22:54:07 +0000 |
| commit | d5b34a28cfdb46b5f9ea35727151802ef7881c4e (patch) | |
| tree | 4e57e19ce49835db43946962850c32e4e13b3e06 /src | |
| parent | 3cf924b934322fd7b514600a7dc84fc517515346 (diff) | |
| parent | 6d2493bf5d6c97bc52aa109944a7f27ee456192e (diff) | |
| download | rust-d5b34a28cfdb46b5f9ea35727151802ef7881c4e.tar.gz rust-d5b34a28cfdb46b5f9ea35727151802ef7881c4e.zip | |
Auto merge of #126352 - cuviper:centos7-vault, r=Kobzol
ci: Update centos:7 to use vault repos CentOS 7 is going EOL on June 30, after which its package repos will no longer exist on the regular mirrors. We'll still be able to access packages from the vault server though, and can start doing so now. This affects `dist-i686-linux` and `dist-x86_64-linux`. I also removed `epel-release` because we were only using that for its `cmake3`, but we've been building our own version for a while. try-job: dist-i686-linux try-job: dist-x86_64-linux
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 6 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index 1704bef1e4e..414bcc52484 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -6,8 +6,12 @@ FROM centos:7 WORKDIR /build +# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault. +RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \ + -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!' +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf + RUN yum upgrade -y && \ - yum install -y epel-release && \ yum install -y \ automake \ bzip2 \ diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 4e1aae98221..4aa1a3ccc2a 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -6,8 +6,12 @@ FROM centos:7 WORKDIR /build +# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault. +RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \ + -e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!' +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf + RUN yum upgrade -y && \ - yum install -y epel-release && \ yum install -y \ automake \ bzip2 \ |