Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch centos7 container repos to use vault #897

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Switch centos7 container repos to use vault #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Dockerfiles/SIMP_EL7_Build.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ RUN ./01_disable_systemctl.sh
RUN ./05_selinux.sh
RUN ./10_dev_packages.sh
RUN ./user.sh
RUN ./rvm.sh "$ruby_version"
RUN ./rvm.sh build_user "$ruby_version"
RUN ./prime_ruby.sh
RUN ./package_cleanup.sh
RUN rm -rf /root/build_scripts
Expand Down
4 changes: 3 additions & 1 deletion build/Dockerfiles/scripts/common/rvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ runuser $user_id -l -c "curl -sSL https://raw.githubusercontent.com/rvm/rvm/stab
runuser $user_id -l -c "rvm install ${ruby_version}"
runuser $user_id -l -c "rvm use --default ${ruby_version}"
runuser $user_id -l -c "rvm all do gem install bundler -v '~> 1.16'"
runuser $user_id -l -c "rvm all do gem install bundler -v '~> 2.0'"
runuser $user_id -l -c "rvm ls"
#runuser $user_id -l -c "rvm all do gem install bundler -v '~> 2.0'"
runuser $user_id -l -c "rvm all do gem install bundler -v 2.4.22"
11 changes: 11 additions & 0 deletions build/Dockerfiles/scripts/el7/00_system_prep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ yum clean all
rm -f /var/lib/rpm/__db*
yum clean all && yum history sync

# Deal with vault-ized CentOS7 repos, post-EOL
sed -i \
-e 's@^mirrorlist.*=os$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/os/$basearch/@' \
-e 's@^mirrorlist.*=updates$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/updates/$basearch/@' \
-e 's@^mirrorlist.*=extras$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/extras/$basearch/@' \
-e 's@^mirrorlist.*=centosplus$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/centosplus/$basearch/@' \
-e 's@^mirrorlist.*=os$@baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/os/$basearch/@' \
/etc/yum.repos.d/CentOS-Base.repo

sed -i -e '/^#mirrorlist/d' -e '/^#baseurl=/d' /etc/yum.repos.d/{CentOS-Base.repo,CentOS-SCLo-scl-*.repo} ||:

# The `yum-plugin-ovl` package is needed to avoid "copy-up" mistmatch
# issues problems when using overlayFS. However, in early releases of
# EL7, the package was not included—so the `touch /var/lib/rpm/*;`
Expand Down
11 changes: 11 additions & 0 deletions build/Dockerfiles/scripts/el7/10_dev_packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ yum install -y rpm-build rpmdevtools rpm-devel rpm-sign yum-utils createrepo

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

# Deal with vault-ized CentOS7 repos, post-EOL
# (at this point, SSL is updated enough use modern https)
yum-config-manager --setopt=base.baseurl='https://vault.centos.org/centos/$releasever/os/$basearch/' --save
yum-config-manager --setopt=updates.baseurl='https://vault.centos.org/centos/$releasever/updates/$basearch/' --save
yum-config-manager --setopt=extras.baseurl='https://vault.centos.org/centos/$releasever/extras/$basearch/' --save
yum-config-manager --setopt=centosplus.baseurl='https://vault.centos.org/centos/$releasever/centosplus/$basearch/' --save
yum-config-manager --setopt=centos-sclo-rh.baseurl='https://vault.centos.org/centos/$releasever/sclo/$basearch/rh/' --save
yum-config-manager --setopt=centos-sclo-sclo.baseurl='https://vault.centos.org/centos/$releasever/sclo/$basearch/sclo/' --save

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}

yum install -y libyaml-devel glibc-headers autoconf gcc gcc-c++ glibc-devel readline-devel libffi-devel automake libtool bison sqlite-devel

yum-config-manager --enable rhel-server-rhscl-7-rpms
Expand Down
Loading