From 20cb5658cbde9667b25f31197cabc0eb74b3495a Mon Sep 17 00:00:00 2001
From: Radu Carpa <radu.carpa@cern.ch>
Date: Thu, 23 Mar 2023 14:30:56 +0100
Subject: [PATCH] clients: switch to using arc6-client on centos7

Also:
- remove the py2 dockerfile
- split the installed packages one per line to make it more
  human-readable.
---
 clients/Dockerfile     | 24 +++++++++++++----------
 clients/Dockerfile_py2 | 44 ------------------------------------------
 2 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 clients/Dockerfile_py2

diff --git a/clients/Dockerfile b/clients/Dockerfile
index c752949..0f25e0b 100644
--- a/clients/Dockerfile
+++ b/clients/Dockerfile
@@ -3,16 +3,20 @@ FROM centos:7
 ARG TAG
 
 RUN yum install -y epel-release.noarch && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-RUN yum upgrade -y && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-RUN yum -y install https://repo.ius.io/ius-release-el7.rpm && \
-    yum install -y python36u-pip voms-clients-java gfal2-all gfal2-util python3-gfal2 xrootd-client\
-                   nordugrid-arc-client nordugrid-arc-plugins-gfal \
-                   nordugrid-arc-plugins-globus nordugrid-arc-plugins-s3 \
-                   nordugrid-arc-plugins-xrootd && \
+    yum upgrade -y && \
+    yum install -y https://repo.ius.io/ius-release-el7.rpm && \
+    yum install -y \
+        gfal2-all \
+        gfal2-util \
+        python3-gfal2 \
+        python36u-pip \
+        nordugrid-arc6-client \
+        nordugrid-arc6-plugins-gfal \
+        nordugrid-arc6-plugins-globus \
+        nordugrid-arc6-plugins-s3 \
+        nordugrid-arc6-plugins-xrootd \
+        voms-clients-java \
+        xrootd-client && \
     yum clean all && \
     rm -rf /var/cache/yum
 
diff --git a/clients/Dockerfile_py2 b/clients/Dockerfile_py2
deleted file mode 100644
index 6b8f5fe..0000000
--- a/clients/Dockerfile_py2
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM centos:7
-
-ARG TAG
-
-RUN yum install -y epel-release.noarch && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-RUN yum upgrade -y && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-RUN yum install -y python-pip \
-                   voms-clients-java \
-                   gfal2-all gfal2-util \
-                   xrootd-client \
-                   nordugrid-arc-client nordugrid-arc-plugins-gfal \
-                   nordugrid-arc-plugins-globus nordugrid-arc-plugins-s3 \
-                   nordugrid-arc-plugins-xrootd && \
-    yum clean all && \
-    rm -rf /var/cache/yum
-
-# Upgrade pip & setuptools and install Rucio
-RUN pip install --no-cache-dir --upgrade pip && \
-    pip install --no-cache-dir --upgrade setuptools && \
-    pip install --no-cache-dir --pre rucio-clients==$TAG && \
-    pip install --no-cache-dir jinja2 j2cli pyyaml
-
-# Add a separate user and change ownership of config dir to that user
-RUN groupadd -g 1000 user && \
-    useradd -ms /bin/bash -u 1000 -g 1000 user && \
-    mkdir -p /opt/rucio/etc/ && \
-    chown -R user:user /opt/rucio/etc/ && \
-    mkdir -p /opt/user && \
-    chown user:user /opt/user
-
-USER user
-WORKDIR /home/user
-
-# Add the configuration template and enable bash completion for the rucio clients
-ADD --chown=user:user rucio.cfg.j2 /opt/user/rucio.cfg.j2
-ADD init_rucio.sh /etc/profile.d/rucio_init.sh
-
-ENV PATH $PATH:/opt/rucio/bin
-
-CMD ["/bin/bash"]