Skip to content

Commit 9080edd

Browse files
committed
Switch centos7 container repos to use vault
el7 acceptance tests using the `simpproject/simp_build_centos7` have been failing because when CentOS 7 EOLed, most of the repos baked into that container were retired. This patch fixes the el7 Dockerfiles to build containers using the new archived repo URLs at vault.centos.org Fixes #896
1 parent ed61be8 commit 9080edd

File tree

4 files changed

+26
-2
lines changed

4 files changed

+26
-2
lines changed

build/Dockerfiles/SIMP_EL7_Build.dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN ./01_disable_systemctl.sh
4646
RUN ./05_selinux.sh
4747
RUN ./10_dev_packages.sh
4848
RUN ./user.sh
49-
RUN ./rvm.sh "$ruby_version"
49+
RUN ./rvm.sh build_user "$ruby_version"
5050
RUN ./prime_ruby.sh
5151
RUN ./package_cleanup.sh
5252
RUN rm -rf /root/build_scripts

build/Dockerfiles/scripts/common/rvm.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ runuser $user_id -l -c "curl -sSL https://raw.githubusercontent.com/rvm/rvm/stab
2727
runuser $user_id -l -c "rvm install ${ruby_version}"
2828
runuser $user_id -l -c "rvm use --default ${ruby_version}"
2929
runuser $user_id -l -c "rvm all do gem install bundler -v '~> 1.16'"
30-
runuser $user_id -l -c "rvm all do gem install bundler -v '~> 2.0'"
30+
runuser $user_id -l -c "rvm ls"
31+
#runuser $user_id -l -c "rvm all do gem install bundler -v '~> 2.0'"
32+
runuser $user_id -l -c "rvm all do gem install bundler -v 2.4.22"

build/Dockerfiles/scripts/el7/00_system_prep.sh

+11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ yum clean all
77
rm -f /var/lib/rpm/__db*
88
yum clean all && yum history sync
99

10+
# Deal with vault-ized CentOS7 repos, post-EOL
11+
sed -i \
12+
-e 's@^mirrorlist.*=os$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/os/$basearch/@' \
13+
-e 's@^mirrorlist.*=updates$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/updates/$basearch/@' \
14+
-e 's@^mirrorlist.*=extras$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/extras/$basearch/@' \
15+
-e 's@^mirrorlist.*=centosplus$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/centosplus/$basearch/@' \
16+
-e 's@^mirrorlist.*=os$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/os/$basearch/@' \
17+
/etc/yum.repos.d/CentOS-Base.repo
18+
19+
sed -i -e '/^#mirrorlist/d' -e '/^#baseurl=/d' /etc/yum.repos.d/{CentOS-Base.repo,CentOS-SCLo-scl-*.repo} ||:
20+
1021
# The `yum-plugin-ovl` package is needed to avoid "copy-up" mistmatch
1122
# issues problems when using overlayFS. However, in early releases of
1223
# EL7, the package was not included—so the `touch /var/lib/rpm/*;`

build/Dockerfiles/scripts/el7/10_dev_packages.sh

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@ yum install -y rpm-build rpmdevtools rpm-devel rpm-sign yum-utils createrepo
1111

1212
yum install -y centos-release-scl python-pip python-virtualenv fontconfig dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-serif-fonts dejavu-fonts-common libjpeg-devel zlib-devel openssl-devel
1313

14+
# Deal with vault-ized CentOS7 repos, post-EOL
15+
# (at this point, SSL is updated enough use modern https)
16+
yum-config-manager --setopt=base.baseurl='https://vault.centos.org/centos/$releasever/os/$basearch/' --save
17+
yum-config-manager --setopt=updates.baseurl='https://vault.centos.org/centos/$releasever/updates/$basearch/' --save
18+
yum-config-manager --setopt=extras.baseurl='https://vault.centos.org/centos/$releasever/extras/$basearch/' --save
19+
yum-config-manager --setopt=centosplus.baseurl='https://vault.centos.org/centos/$releasever/centosplus/$basearch/' --save
20+
yum-config-manager --setopt=centos-sclo-rh.baseurl='https://vault.centos.org/centos/$releasever/sclo/$basearch/rh/' --save
21+
yum-config-manager --setopt=centos-sclo-sclo.baseurl='https://vault.centos.org/centos/$releasever/sclo/$basearch/sclo/' --save
22+
23+
sed -i -e 's/^mirrorlist/#\0/g' -e '/^#baseurl=/d' /etc/yum.repos.d/{CentOS-Base.repo,CentOS-SCLo-scl-rh.repo,CentOS-SCLo-scl.repo}
24+
1425
yum install -y libyaml-devel glibc-headers autoconf gcc gcc-c++ glibc-devel readline-devel libffi-devel automake libtool bison sqlite-devel
1526

1627
yum-config-manager --enable rhel-server-rhscl-7-rpms

0 commit comments

Comments
 (0)