Skip to content

Remove EL7/3.6 code from Dockerfile #91

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 2 commits into from
Sep 23, 2024
Merged

Remove EL7/3.6 code from Dockerfile #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edfd4b3
Remove EL7/3.6 code from Dockerfile
matyasselmeci Sep 19, 2024
95714db
Missed a spot
matyasselmeci Sep 19, 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
33 changes: 4 additions & 29 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,17 @@ RUN \
log () { printf "\n%s\t%s\n\n" "$(date '+%F %X %z')" "$*" ; } ; \
# Attempt to grab the major version from the tag \
DVER=$(egrep -o '[0-9][\.0-9]*$' <<< "$IMAGE_BASE" | cut -d. -f1); \
if [[ $DVER == 7 ]]; then \
YUM_PKG_NAME="yum-plugin-priorities"; \
yum-config-manager \
--setopt=skip_missing_names_on_install=False \
--setopt=skip_missing_names_on_update=False \
--save > /dev/null; \
else \
YUM_PKG_NAME="yum-utils"; \
fi && \
log "Updating OS YUM cache" && time \
yum makecache && \
log "Updating OS" && time \
yum distro-sync -y && \
if [[ $OSG_RELEASE =~ ^[0-9][0-9]$ ]]; then \
OSG_URL=https://repo.opensciencegrid.org/osg/${OSG_RELEASE}-main/osg-${OSG_RELEASE}-main-el${DVER}-release-latest.rpm; \
else \
OSG_URL=https://repo.opensciencegrid.org/osg/${OSG_RELEASE}/osg-${OSG_RELEASE}-el${DVER}-release-latest.rpm; \
fi && \
OSG_URL=https://repo.opensciencegrid.org/osg/${OSG_RELEASE}-main/osg-${OSG_RELEASE}-main-el${DVER}-release-latest.rpm && \
log "Installing EPEL/OSG repo packages" && time \
yum -y install $OSG_URL \
epel-release \
$YUM_PKG_NAME && \
Copy link
Contributor

Choose a reason for hiding this comment

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

Is yum-utils no longer needed in el8+?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's hard to see in the diff but I do actually install it

if [[ $DVER == 8 ]]; then \
yum-config-manager --enable powertools && \
yum-config-manager --setopt=install_weak_deps=False --save > /dev/null; \
fi && \
if [[ $DVER == 9 ]]; then \
yum-config-manager --enable crb && \
yum-config-manager --setopt=install_weak_deps=False --save > /dev/null; \
fi && \
yum-utils && \
yum-config-manager --setopt=install_weak_deps=False --save > /dev/null && \
/usr/bin/crb enable && \
if [[ $BASE_YUM_REPO != "release" ]]; then \
yum-config-manager --enable osg-${BASE_YUM_REPO}; \
yum-config-manager --enable osg-upcoming-${BASE_YUM_REPO}; else \
Expand Down Expand Up @@ -72,11 +53,6 @@ RUN \
# Impatiently ignore the Yum mirrors
sed -i 's/\#baseurl/baseurl/; s/mirrorlist/\#mirrorlist/' \
/etc/yum.repos.d/osg*.repo && \
# Disable gpgcheck for devops, till we get them rebuilt for SOFTWARE-5422
if [[ $OSG_RELEASE == "3.6" ]]; then \
sed -i 's/gpgcheck=1/gpgcheck=0/' \
/etc/yum.repos.d/devops*.repo; \
fi && \
mkdir -p /etc/osg/image-{cleanup,init}.d/ && \
# Support old init script dir name
ln -s /etc/osg/image-{init,config}.d
Expand All @@ -96,7 +72,6 @@ RUN chmod g+w /var/log /var/log/supervisor /var/run

# Allow use of SHA1 certificates.
# Accepted values are "YES" (enable them, even on EL9), "NO" (disable them, even on EL8), "DEFAULT" (use OS default).
# No effect on EL7.
ENV ENABLE_SHA1=DEFAULT

CMD ["/usr/local/sbin/supervisord_startup.sh"]