Migrate to sslhep/rucio-client to get modern version of python (#487)

ssl-hep · Nov 1, 2022 · 785ecfa · 785ecfa
1 parent 9f970d4
commit 785ecfa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 22 deletions.
diff --git a/did_finder_rucio/Dockerfile b/did_finder_rucio/Dockerfile
@@ -1,4 +1,4 @@
-FROM rucio/rucio-clients:latest
+FROM sslhep/rucio-client:main
 
 LABEL maintainer Ilija Vukotic <[email protected]>
 
@@ -12,14 +12,6 @@ RUN mkdir -p /etc/grid-security/certificates /etc/grid-security/vomsdir
 RUN yum clean all
 RUN yum -y update
 
-RUN yum install -y https://repo.opensciencegrid.org/osg/3.5/osg-3.5-el7-release-latest.rpm
-
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; \
-    curl -s -o /etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg http://linuxsoft.cern.ch/wlcg/RPM-GPG-KEY-wlcg; \
-    curl -s -o /etc/yum.repos.d/wlcg-centos7.repo http://linuxsoft.cern.ch/wlcg/wlcg-centos7.repo;
-
-RUN yum install osg-ca-certs voms voms-clients wlcg-voms-atlas fetch-crl -y
-
 # Okay, change our shell to specifically use our software collections.
 # (default was SHELL [ "/bin/sh", "-c" ])
 # https://docs.docker.com/engine/reference/builder/#shell

diff --git a/did_finder_rucio/poetry.lock b/did_finder_rucio/poetry.lock
diff --git a/did_finder_rucio/pyproject.toml b/did_finder_rucio/pyproject.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "did_finder_rucio"}]
 
 [tool.poetry.dependencies]
-python = "~3.10"
+python = "^3.9"
 rucio-clients = "^1.29.7.post1"
 pika = "1.1.0"
 servicex-did-finder-lib = "1.2"

diff --git a/x509_secrets/Dockerfile b/x509_secrets/Dockerfile
@@ -1,4 +1,4 @@
-FROM rucio/rucio-clients:latest
+FROM sslhep/rucio-client:main
 
 USER root
 
@@ -11,14 +11,6 @@ RUN mkdir -p /etc/grid-security/certificates /etc/grid-security/vomsdir
 
 RUN yum -y update
 
-RUN yum install -y https://repo.opensciencegrid.org/osg/3.5/osg-3.5-el7-release-latest.rpm
-
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm; \
-    curl -s -o /etc/pki/rpm-gpg/RPM-GPG-KEY-wlcg http://linuxsoft.cern.ch/wlcg/RPM-GPG-KEY-wlcg; \
-    curl -s -o /etc/yum.repos.d/wlcg-centos7.repo http://linuxsoft.cern.ch/wlcg/wlcg-centos7.repo;
-
-RUN yum install osg-ca-certs voms voms-clients wlcg-voms-atlas wlcg-voms-cms fetch-crl -y
-
 ENV POETRY_VERSION=1.2.2
 RUN python3 -m pip install --upgrade pip
 

diff --git a/x509_secrets/pyproject.toml b/x509_secrets/pyproject.toml
@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "x509_secrets"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.9"
 kubernetes = "^25.3.0"