Skip to content

Commit 5c2ab51

Browse files
authored
Rollup 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
2 parents c8fdbf2 + 6d2493b commit 5c2ab51

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ FROM centos:7
66

77
WORKDIR /build
88

9+
# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
10+
RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
11+
-e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
12+
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
13+
914
RUN yum upgrade -y && \
10-
yum install -y epel-release && \
1115
yum install -y \
1216
automake \
1317
bzip2 \

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ FROM centos:7
66

77
WORKDIR /build
88

9+
# CentOS 7 EOL is June 30, 2024, but the repos remain in the vault.
10+
RUN sed -i /etc/yum.repos.d/*.repo -e 's!^mirrorlist!#mirrorlist!' \
11+
-e 's!^#baseurl=http://mirror.centos.org/!baseurl=https://vault.centos.org/!'
12+
RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
13+
914
RUN yum upgrade -y && \
10-
yum install -y epel-release && \
1115
yum install -y \
1216
automake \
1317
bzip2 \

0 commit comments

Comments
 (0)