Skip to content

HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset #6932

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

Merged
merged 6 commits into from
Jul 11, 2024
Merged

HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset #6932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1f8517f
HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset
pan3793 Jul 9, 2024
9122bef
fix
pan3793 Jul 10, 2024
4d27539
gentler yetus
pan3793 Jul 10, 2024
00fafe5
empty
pan3793 Jul 10, 2024
0a815cd
empty
pan3793 Jul 10, 2024
d59e005
revert ignoring test4tests
pan3793 Jul 11, 2024
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
16 changes: 14 additions & 2 deletions dev-support/docker/Dockerfile_centos_7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ COPY pkg-resolver pkg-resolver
RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \
&& chmod a+r pkg-resolver/*.json

######
# Centos 7 has reached its EOL and the packages
# are no longer available on mirror.centos.org site.
# Please see https://www.centos.org/centos-linux-eol/
######
RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7

######
# Install packages from yum
######
Expand All @@ -38,8 +45,13 @@ RUN yum update -y \
&& yum groupinstall -y "Development Tools" \
&& yum install -y \
centos-release-scl \
python3 \
&& yum install -y $(pkg-resolver/resolve.py centos:7)
python3

# Apply the script again because centos-release-scl creates new YUM repo files
RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7

# hadolint ignore=DL3008,SC2046
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I readed our previous Dockerfiles and found that DL3008 and SC2046 were not ignored. Why we should ignore these two rules here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the hadolint rule codes can be found at https://github.com/hadolint/hadolint?tab=readme-ov-file#rules

RUN yum install -y $(pkg-resolver/resolve.py centos:7)

# Set GCC 9 as the default C/C++ compiler
RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
Expand Down
2 changes: 1 addition & 1 deletion dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ fi
if [ "$1" == "centos:7" ] || [ "$1" == "centos:8" ]; then
cd /etc/yum.repos.d/ || exit &&
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* &&
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* &&
sed -i 's|# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* &&
Copy link
Member Author

@pan3793 pan3793 Jul 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change is necessary, this makes it support both

#baseurl=http://mirror.centos.org/...
# baseurl=http://mirror.centos.org/...

yum update -y &&
cd /root || exit
else
Expand Down