Update Dockerfile defaults to build with OSG 25 and remove OSG 23-specific lines

Author: matyasselmeci

base/Dockerfile

@@ -5,15 +5,15 @@
 # Specify the opensciencegrid/software-base image tag
 ARG BASE_OS=el9
 ARG BASE_YUM_REPO=release
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 
 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
 LABEL maintainer "OSG Software <help@osg-htc.org>"
 
 # previous args have gone out of scope
-ARG BASE_OS=el9
-ARG BASE_YUM_REPO=release
-ARG BASE_OSG_SERIES=23
+ARG BASE_OS
+ARG BASE_YUM_REPO
+ARG BASE_OSG_SERIES
 
 # Ensure that the 'condor' UID/GID matches across containers
 RUN groupadd -g 64 -r condor && \

hosted-ce/Dockerfile

@@ -7,34 +7,26 @@ LABEL maintainer "OSG Software <help@osg-htc.org>"
 LABEL name "hosted-ce"
 
 ARG BASE_YUM_REPO=release
-ARG BASE_OSG_SERIES=24
+ARG BASE_OSG_SERIES=25
 
 
 RUN if [[ $BASE_YUM_REPO == 'release' ]]; then \
-        if [[ $BASE_OSG_SERIES == '23' ]]; then \
-          yum install -y --enablerepo=osg-upcoming-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \
-        else \
-          yum install -y --enablerepo=osg-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \
-        fi \
+        yum install -y --enablerepo=osg-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \
     else \
         yum install -y osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \
     fi && \
     rm -rf /var/cache/yum/
 
 COPY etc/osg/image-config.d/ /etc/osg/image-config.d/
 
-# Use "ssh -q" in bosco_cluster until the chang has been upstreamed to condor
+# Use "ssh -q" in bosco_cluster until the change has been upstreamed to condor
 # Enable bosco_cluster xtrace
 COPY tmp/ /tmp
 
 # SOFTWARE-5613: override package versions of remote WN client scripts
 # to allow for a faster dev -> ops turnaround
 COPY usr/bin/ /usr/bin
 
-# HTCONDOR-2322: Override CE defaults script to fix Environment setting bug.
-# Remove this once HTCondor-CE 23.0.8 is deployed for all hosted-ces.
-COPY usr/share/condor-ce/ /usr/share/condor-ce
-
 # Handle bosco_cluster -> condor_remote_cluster symlink
 RUN sed -i 's/bosco_cluster/condor_remote_cluster/g' /tmp/*.patch && \
     patch -d / -p0 < /tmp/ssh_q.patch && \