fixup, set more s2i env variables

Author: jiridanek

base/c9s-python-3.9/Dockerfile

@@ -5,14 +5,16 @@ FROM quay.io/centos/centos:stream9
 ENV APP_ROOT="/opt/app-root"
 ENV VIRTUAL_ENV="${APP_ROOT}"
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-RUN mkdir --parents --mode 0771 "${APP_ROOT}/src" && chown --recursive 1001:0 ${APP_ROOT} && \
+ENV PYTHON_VERSION=3.9
+ENV PIP_NO_CACHE_DIR=off
+RUN mkdir --parents "${APP_ROOT}/src" && chmod --recursive 0771 ${APP_ROOT} && chown --recursive 1001:0 ${APP_ROOT} && \
     useradd --uid 1001 --gid 0 --no-create-home --home-dir "${APP_ROOT}/src" \
       --comment "Default Application User" --shell /bin/bash default && \
     dnf install -y python3-pip && dnf clean all && rm -rf /var/cache/yum/*
 COPY --from=quay.io/sclorg/s2i-core-c9s:latest /usr/bin/fix-permissions /usr/bin/fix-permissions
 
 USER 1001
-RUN python3.9 -m venv "${VIRTUAL_ENV}"
+RUN python${PYTHON_VERSION} -m venv "${VIRTUAL_ENV}"
 
 LABEL name="odh-notebook-base-centos-stream9-python-3.9" \
       summary="Python 3.9 CentOS Stream 9 base image for ODH notebooks" \

base/ubi9-python-3.11/Dockerfile

@@ -5,14 +5,16 @@ FROM registry.access.redhat.com/ubi9/ubi:latest
 ENV APP_ROOT="/opt/app-root"
 ENV VIRTUAL_ENV="${APP_ROOT}"
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-RUN mkdir --parents --mode 0771 "${APP_ROOT}/src" && chown --recursive 1001:0 ${APP_ROOT} && \
+ENV PYTHON_VERSION=3.11
+ENV PIP_NO_CACHE_DIR=off
+RUN mkdir --parents "${APP_ROOT}/src" && chmod --recursive 0771 ${APP_ROOT} && chown --recursive 1001:0 ${APP_ROOT} && \
     useradd --uid 1001 --gid 0 --no-create-home --home-dir "${APP_ROOT}/src" \
       --comment "Default Application User" --shell /bin/bash default && \
     dnf install -y python311-pip && dnf clean all && rm -rf /var/cache/yum/* && \
 COPY --from=quay.io/sclorg/s2i-core-c9s:latest /usr/bin/fix-permissions /usr/bin/fix-permissions
 
 USER 1001
-RUN python3.11 -m venv "${VIRTUAL_ENV}"
+RUN python${PYTHON_VERSION} -m venv "${VIRTUAL_ENV}"
 
 LABEL name="odh-notebook-base-ubi9-python-3.11" \
       summary="Python 3.11 base image for ODH notebooks" \
@@ -50,7 +52,7 @@ RUN curl -L https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/oc
     rm -f /tmp/openshift-client-linux.tar.gz
 
 # Fix permissions to support pip in Openshift environments
-RUN chmod -R g+w /opt/app-root/lib/python3.11/site-packages && \
+RUN chmod -R g+w /opt/app-root/lib/python${PYTHON_VERSION}/site-packages && \
       fix-permissions /opt/app-root -P
 
 WORKDIR /opt/app-root/src

base/ubi9-python-3.9/Dockerfile

@@ -5,14 +5,16 @@ FROM registry.access.redhat.com/ubi9/ubi:latest
 ENV APP_ROOT="/opt/app-root"
 ENV VIRTUAL_ENV="${APP_ROOT}"
 ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-RUN mkdir --parents --mode 0771 "${APP_ROOT}/src" && chown --recursive 1001:0 ${APP_ROOT} && \
+ENV PYTHON_VERSION=3.9
+ENV PIP_NO_CACHE_DIR=off
+RUN mkdir --parents "${APP_ROOT}/src" && chmod --recursive 0771 ${APP_ROOT} && chown --recursive 1001:0 ${APP_ROOT} && \
     useradd --uid 1001 --gid 0 --no-create-home --home-dir "${APP_ROOT}/src" \
       --comment "Default Application User" --shell /bin/bash default && \
     dnf install -y python3-pip && dnf clean all && rm -rf /var/cache/yum/*
 COPY --from=quay.io/sclorg/s2i-core-c9s:latest /usr/bin/fix-permissions /usr/bin/fix-permissions
 
 USER 1001
-RUN python3.9 -m venv "${VIRTUAL_ENV}"
+RUN python${PYTHON_VERSION} -m venv "${VIRTUAL_ENV}"
 
 LABEL name="odh-notebook-base-ubi9-python-3.9" \
       summary="Python 3.9 base image for ODH notebooks" \