Skip to content

Commit

Permalink
Updating the OSG repo to OSG 23 for EL8 and 9
Browse files Browse the repository at this point in the history 
Removed the UWMadison HTCondor repo because it is in synch with the OSG one
  • Loading branch information
@mambelli
mambelli committed Nov 26, 2024
1 parent 5291608 commit f706e6d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 37 deletions.
25 changes: 7 additions & 18 deletions worker/fnal-wn-el8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,18 @@
# Selecting AlmaLinux 8 as the base OS
FROM almalinux:8
MAINTAINER Marco Mambelli "[email protected]"

Check warning on line 6 in worker/fnal-wn-el8/Dockerfile

View workflow job for this annotation

GitHub Actions / build

The MAINTAINER instruction is deprecated, use a label instead to define an image author 

MaintainerDeprecated: Maintainer instruction is deprecated in favor of using label
More info: https://docs.docker.com/go/dockerfile/rule/maintainer-deprecated/

Check warning on line 6 in worker/fnal-wn-el8/Dockerfile

View workflow job for this annotation

GitHub Actions / build

The MAINTAINER instruction is deprecated, use a label instead to define an image author 

MaintainerDeprecated: Maintainer instruction is deprecated in favor of using label
More info: https://docs.docker.com/go/dockerfile/rule/maintainer-deprecated/
LABEL name="FNAL Worker Node on EL8 with OSG 3.6 Worker Node Client"

# Setting up the HTCondor Madison repository
# Technically, HTCondor isn't installed but this has been done
# to keep in sync with other Docker file and keep the source of
# the packages consistent
# Assigning the repo yum prio of 90
# Installing wget to help with repo setup
RUN yum install -y wget sed ;\
/usr/bin/wget http://research.cs.wisc.edu/htcondor/yum/repo.d/htcondor-stable-rhel8.repo -O /etc/yum.repos.d/condor.repo ;\
/usr/bin/wget http://research.cs.wisc.edu/htcondor/yum/RPM-GPG-KEY-HTCondor -O /etc/pki/rpm-gpg/RPM-GPG-KEY-HTCondor ;\
echo "priority=90" >> /etc/yum.repos.d/condor.repo ;\
echo "exclude=*.i686" >> /etc/yum.repos.d/condor.repo ;\
echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-HTCondor" >> /etc/yum.repos.d/condor.repo
LABEL name="FNAL Worker Node on EL8 with OSG 23 Worker Node Client"

# Starting OSG 23 the HTCondor Madison repository is in synch with the OSG one so I'm removing it from the container.
# HTCondor, if needed, will be installed from the OSG repository

# Next setting up EPEL and OSG repositories
# OSG by default has a YUM prio of 98
# Assigning EPEL YUM prio of 99
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ;\
yum -y install https://repo.opensciencegrid.org/osg/3.6/osg-3.6-el8-release-latest.rpm \
RUN yum -y install wget sed https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ;\
yum -y install https://repo.opensciencegrid.org/osg/23-main/osg-23-main-el8-release-latest.rpm \
epel-release ;\
/bin/sed -i '/^enabled=1/a priority=99' /etc/yum.repos.d/epel.repo ;\
echo "exclude=*condor*" >> /etc/yum.repos.d/osg.repo
/bin/sed -i '/^enabled=1/a priority=99' /etc/yum.repos.d/epel.repo

# Installing packages
# Singularity version has been explicitly specified to control upgrades
Expand Down
26 changes: 7 additions & 19 deletions worker/fnal-wn-el9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,18 @@
# Selecting AlmaLinux 9 as the base OS
FROM almalinux:9
MAINTAINER Marco Mambelli "[email protected]"

Check warning on line 6 in worker/fnal-wn-el9/Dockerfile

View workflow job for this annotation

GitHub Actions / build

The MAINTAINER instruction is deprecated, use a label instead to define an image author 

MaintainerDeprecated: Maintainer instruction is deprecated in favor of using label
More info: https://docs.docker.com/go/dockerfile/rule/maintainer-deprecated/

Check warning on line 6 in worker/fnal-wn-el9/Dockerfile

View workflow job for this annotation

GitHub Actions / build

The MAINTAINER instruction is deprecated, use a label instead to define an image author 

MaintainerDeprecated: Maintainer instruction is deprecated in favor of using label
More info: https://docs.docker.com/go/dockerfile/rule/maintainer-deprecated/
LABEL name="FNAL Worker Node on EL9 with OSG 3.6 Worker Node Client"

# ThESE ARE NOT YET AVAILABLE
# Setting up the HTCondor Madison repository
# Technically, HTCondor isn't installed but this has been done
# to keep in sync with other Docker file and keep the source of
# the packages consistent
# Assigning the repo yum prio of 90
# Installing wget to help with repo setup
#RUN yum install -y wget sed ;\
# /usr/bin/wget http://research.cs.wisc.edu/htcondor/yum/repo.d/htcondor-stable-rhel9.repo -O /etc/yum.repos.d/condor.repo ;\
# /usr/bin/wget http://research.cs.wisc.edu/htcondor/yum/RPM-GPG-KEY-HTCondor -O /etc/pki/rpm-gpg/RPM-GPG-KEY-HTCondor ;\
# echo "priority=90" >> /etc/yum.repos.d/condor.repo ;\
# echo "exclude=*.i686" >> /etc/yum.repos.d/condor.repo ;\
# echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-HTCondor" >> /etc/yum.repos.d/condor.repo
LABEL name="FNAL Worker Node on EL9 with OSG 23 Worker Node Client"

# Starting OSG 23 the HTCondor Madison repository is in synch with the OSG one so I'm removing it from the container.
# HTCondor, if needed, will be installed from the OSG repository

# Next setting up EPEL and OSG repositories
# OSG by default has a YUM prio of 98
# Assigning EPEL YUM prio of 99
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm ;\
yum -y install https://repo.opensciencegrid.org/osg/3.6/osg-3.6-el9-release-latest.rpm \
RUN yum -y install wget sed https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm ;\
yum -y install https://repo.opensciencegrid.org/osg/23-main/osg-23-main-el9-release-latest.rpm \
epel-release ;\
/bin/sed -i '/^enabled=1/a priority=99' /etc/yum.repos.d/epel.repo ;\
echo "exclude=*condor*" >> /etc/yum.repos.d/osg.repo
/bin/sed -i '/^enabled=1/a priority=99' /etc/yum.repos.d/epel.repo

# Installing packages
# Singularity version has been explicitly specified to control upgrades
Expand Down

0 comments on commit f706e6d

Please sign in to comment.