From ba934d30402918a3cbd06b0f946bc3b487f74bf8 Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban@inaf.it>
Date: Fri, 6 Jun 2025 17:19:57 +0200
Subject: [PATCH] First tests with Rocky Linux 9 and Python 3.12.
Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it>
---
base/Dockerfile | 10 +++++-----
client/Dockerfile | 6 +++---
transfer_service/start.sh | 2 +-
transfer_service/tape_client.py | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/base/Dockerfile b/base/Dockerfile
index 0b2b3c4..7e6603b 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -4,11 +4,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
-# Use Rocky Linux 8.9 minimal as base image
-FROM rockylinux:8.9-minimal
+# Use Rocky Linux 9.3 minimal as base image
+FROM rockylinux:9.3-minimal
-# Install epel repo, make, nano, openssh, wget, rsync, cronie, pip
-RUN microdnf -y install epel-release make nano openssh-clients wget rsync cronie python3.11-pip
+# Install epel repo, make, nano, openssh, iputils, wget, rsync, cronie, pip
+RUN microdnf -y install epel-release make nano openssh-clients iputils wget rsync cronie python3.12-pip
# Install redis, psycopg2, paramiko, scp, tabulate Python packages
-RUN pip3.11 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate
+RUN pip3.12 install --no-cache-dir redis hiredis psycopg2-binary paramiko scp tabulate
diff --git a/client/Dockerfile b/client/Dockerfile
index 6ff3c86..f92f118 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -4,8 +4,8 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
-# Use python 3.11.7-slim as base image
-FROM python:3.11.7-slim
+# Use python 3.12.9-slim as base image
+FROM python:3.12.9-slim
# Install psql client to be able to connect manually to the file_catalog container
# Install also redis-tools to be able to access the redis container via redis-cli
@@ -50,4 +50,4 @@ RUN echo ". /usr/share/bash-completion/completions/vos_data" >> .bashrc && \
echo ". /usr/share/bash-completion/completions/vos_storage" >> .bashrc
# Install python dependencies
-RUN pip3.11 install --no-cache-dir redis hiredis tabulate
+RUN pip3.12 install --no-cache-dir redis hiredis tabulate
diff --git a/transfer_service/start.sh b/transfer_service/start.sh
index be188c4..05e6be4 100644
--- a/transfer_service/start.sh
+++ b/transfer_service/start.sh
@@ -15,4 +15,4 @@ do
chmod -R 755 /mnt/hot_storage/users/${user}
done
-crond && /usr/bin/python3.11 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log
+crond && /usr/bin/python3.12 transfer_service.py 2>&1 >> /var/log/vos_ts/error.log
diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py
index aeebfab..eec9177 100644
--- a/transfer_service/tape_client.py
+++ b/transfer_service/tape_client.py
@@ -184,7 +184,7 @@ class TapeClient(object):
"""
self.logger.info("Starting RECALL_CHECKSUM operation...")
checksumFileList = f"vos_recall_checksum_files-{jobId}.lst"
- cmd = f"find $(dirname {dirName}) -type f \( -iname \"*-md5sum.txt\" \) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1"
+ cmd = f"find $(dirname {dirName}) -type f \\( -iname \"*-md5sum.txt\" \\) > {self.VOSPACE_WD}/{checksumFileList} && {self.DSMRECALL} -filelist={self.VOSPACE_WD}/{checksumFileList} > /dev/null 2>&1"
try:
stdin, stdout, stderr = self.client.exec_command(cmd)
except Exception:
--
GitLab