diff --git a/base/Dockerfile b/base/Dockerfile index 0b2b3c400c56caf4aa5274c5b527de105d5756a9..7e6603ba0a9dba56bb2e4b4cb5a03cc2a82c7514 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 6ff3c863e632b288c5561125615781d9b571cc73..f92f1187d2cda1b4531bef139f8d04b1d300104d 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 be188c4e7d2540cb81f4e64f3ef48353b4dc196d..05e6be44f60130aa5aa1d6ac358e05b85ee10de9 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 aeebfabd0b74a0321a8f18f7f6ba8238f991fefe..eec91779bef643500685b57e428cbbf589c43f25 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: