From fce34dadab3fdf4a9f756fba1939666a7a2dbc9b Mon Sep 17 00:00:00 2001
From: Clemens Lange <clemens.lange@cern.ch>
Date: Fri, 14 Jul 2023 10:06:12 +0200
Subject: [PATCH] Update to Python 3.10.12 and XrootD 5.5.5

---
 .gitlab-ci.yml | 2 +-
 Dockerfile     | 6 +++---
 Makefile       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 857ca8b..54ac49a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ tag_image:
     - skopeo copy "docker://${IMAGE_ORIGIN_TAG}" "docker://${DOCKER_REGISTRY}/${DOCKER_GROUP}/${CI_PROJECT_NAME}"
   variables:
     IMAGE_ORIGIN_TAG: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}
-    IMAGE_DESTINATION_TAG: ${CI_REGISTRY_IMAGE}:python3.10.5
+    IMAGE_DESTINATION_TAG: ${CI_REGISTRY_IMAGE}:python3.10.12
     IMAGE_DESTINATION_LATEST: ${CI_REGISTRY_IMAGE}:latest
     DOCKER_GROUP: cmscloud
     DOCKER_REGISTRY: docker.io
diff --git a/Dockerfile b/Dockerfile
index 45695b4..42a9fcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.10.5
+ARG PYTHON_VERSION=3.10.12
 FROM python:${PYTHON_VERSION}-bullseye
 
 LABEL maintainer.name="CMS Data Preservation and Open Access Group"
@@ -7,7 +7,7 @@ LABEL maintainer.email="cms-dpoa-coordinators@cern.ch"
 ENV LANG=C.UTF-8
 
 ARG PLATFORM="linux/amd64"
-ARG PYTHON_VERSION=3.10.5
+ARG PYTHON_VERSION=3.10.12
 
 WORKDIR /usr/local
 
@@ -32,7 +32,7 @@ RUN apt-get -qq -y update && \
     ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
 # Add XRootD under /usr/local
-ARG XROOTD_TAG=v5.4.3
+ARG XROOTD_TAG=v5.5.5
 WORKDIR /code
 RUN git clone --depth 1 https://github.com/xrootd/xrootd.git \
         --branch "${XROOTD_TAG}" \
diff --git a/Makefile b/Makefile
index d681a68..9c56777 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ default: python_image
 all: python_image
 
 # global build variables
-PYTHON_VERSION=3.10.5
+PYTHON_VERSION=3.10.12
 PLATFORM="linux/amd64"
 
 python_image:
@@ -11,7 +11,7 @@ python_image:
 	-f Dockerfile \
 	--platform "${PLATFORM}" \
 	--build-arg PLATFORM=${PLATFORM} \
-	--build-arg XROOTD_TAG=v5.4.3 \
+	--build-arg XROOTD_TAG=v5.5.5 \
 	--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
 	--tag cmscloud/python-vnc:python$(PYTHON_VERSION) \
 	--tag cmscloud/python-vnc
-- 
GitLab