fixups for python 3.11 when it got added

Author: jiridanek

base/c9s-python-3.11/Dockerfile

@@ -1,4 +1,21 @@
-FROM quay.io/sclorg/python-311-c9s:c9s
+FROM quay.io/centos/centos:stream9
+
+# perform the setup that python image used to do for us
+#  but this way it uses a lot less disk space (hundreds of megabytes less)
+ENV APP_ROOT="/opt/app-root"
+ENV HOME="${APP_ROOT}/src"
+ENV VIRTUAL_ENV="${APP_ROOT}"
+ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
+ENV PYTHON_VERSION=3.11
+ENV PIP_NO_CACHE_DIR=off
+RUN mkdir --parents "${HOME}" && chmod --recursive 0771 ${APP_ROOT} && chown --recursive 1001:0 ${APP_ROOT} && \
+    useradd --uid 1001 --gid 0 --no-create-home --home-dir "${HOME}" \
+      --comment "Default Application User" --shell /bin/bash default && \
+    dnf install -y python${PYTHON_VERSION}-pip && dnf clean all && rm -rf /var/cache/yum/*
+COPY --from=quay.io/sclorg/s2i-core-c9s:latest /usr/bin/fix-permissions /usr/bin/rpm-file-permissions /usr/bin/
+
+USER 1001
+RUN python${PYTHON_VERSION} -m venv "${VIRTUAL_ENV}"
 
 ARG SOURCE_CODE=base/c9s-python-3.11
 

base/ubi9-python-3.11/Dockerfile

@@ -11,7 +11,7 @@ ENV PIP_NO_CACHE_DIR=off
 RUN mkdir --parents "${HOME}" && chmod --recursive 0771 ${APP_ROOT} && chown --recursive 1001:0 ${APP_ROOT} && \
     useradd --uid 1001 --gid 0 --no-create-home --home-dir "${HOME}" \
       --comment "Default Application User" --shell /bin/bash default && \
-    dnf install -y python311-pip && dnf clean all && rm -rf /var/cache/yum/* && \
+    dnf install -y python${PYTHON_VERSION}-pip && dnf clean all && rm -rf /var/cache/yum/* && \
 COPY --from=quay.io/sclorg/s2i-core-c9s:latest /usr/bin/fix-permissions /usr/bin/rpm-file-permissions /usr/bin/
 
 USER 1001