From 5e38dead7ddfe057c47e082a6086af80405db83b Mon Sep 17 00:00:00 2001
From: Egor Tyuvaev <egor.tyuvaev@intel.com>
Date: Mon, 11 Nov 2024 13:06:21 +0100
Subject: [PATCH] fix rhel8 entitlement & package installation (#313)

---
 .github/workflows/images_build_check.yml      |  2 +-
 templates/rhel8/common/base.dockerfile.j2     | 42 +++++++++----------
 templates/rhel8/python/python38.dockerfile.j2 |  4 --
 templates/rhel8/python/python39.dockerfile.j2 |  4 ++
 utils/arg_parser.py                           |  4 +-
 5 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 templates/rhel8/python/python38.dockerfile.j2
 create mode 100644 templates/rhel8/python/python39.dockerfile.j2

diff --git a/.github/workflows/images_build_check.yml b/.github/workflows/images_build_check.yml
index 576d87e1..7bbdc314 100644
--- a/.github/workflows/images_build_check.yml
+++ b/.github/workflows/images_build_check.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        image_os: [ubuntu20]
+        image_os: [ubuntu22]
         image_distribution: [runtime]
         exclude:
           - os: ubuntu-20.04
diff --git a/templates/rhel8/common/base.dockerfile.j2 b/templates/rhel8/common/base.dockerfile.j2
index 8ffb3b92..f2819a78 100644
--- a/templates/rhel8/common/base.dockerfile.j2
+++ b/templates/rhel8/common/base.dockerfile.j2
@@ -32,33 +32,32 @@ FROM base as opencv
 LABEL description="This is the dev image for OpenCV building with OpenVINO Runtime backend"
 LABEL vendor="Intel Corporation"
 
+RUN rm -f /etc/rhsm-host
 {% if 'autobuild' != rhel_platform %}
 COPY ./entitlement /etc/pki/entitlement
 COPY ./rhsm-conf /etc/rhsm
-COPY ./rhsm-ca /etc/rhsm/ca
 {% endif %}
-
-RUN rm -f /etc/rhsm-host && subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
-RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf clean all
-RUN dnf install -y https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm && dnf clean all
-# hadolint ignore=DL3033
-RUN yum install -y \
-    gtk3-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-base-devel \
-    ffmpeg-devel \
-    libmfx-devel \
-    cmake \
-    git \
-    python38-devel \
-    python38-pip \
-    gcc-c++  \
-    gcc && yum clean all
+RUN subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
+        https://download1.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm \
+    && dnf install -y \
+        gtk3-devel \
+        gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        ffmpeg-devel \
+        libmfx-devel \
+        cmake \
+        git \
+        python39-devel \
+        python39-pip \
+        gcc-c++  \
+        gcc \
+    && dnf clean all
 
 RUN rm -rf /etc/pki/entitlement && rm -rf /etc/rhsm
 
 RUN python3 -m pip install --no-cache-dir numpy==1.23.1
-ARG OPENCV_BRANCH="377be68d923e40900ac5526242bcf221e3f355e5" # 4.8 with a fix for building tests
+ARG OPENCV_BRANCH=4.10.0
 WORKDIR /opt/repo
 RUN git clone https://github.com/opencv/opencv.git
 WORKDIR /opt/repo/opencv
@@ -187,13 +186,14 @@ COPY --from=base /opt/intel /opt/intel
 {% endif %}
 
 {% if 'runtime' == distribution %}
-ARG LGPL_DEPS="bash" # no new packages
+ARG LGPL_DEPS="bash python39" # no new packages
 ARG INSTALL_PACKAGES="-c=python -c=core"
 {% else %}
 ARG LGPL_DEPS="gcc-c++ \
                glibc \
                libstdc++ \
-               libgcc"
+               libgcc \
+               python39"
 ARG INSTALL_PACKAGES="-c=opencv_req -c=python -c=opencv_opt -c=core -c=dev"
 {% endif %}
 ARG INSTALL_SOURCES="no"
diff --git a/templates/rhel8/python/python38.dockerfile.j2 b/templates/rhel8/python/python38.dockerfile.j2
deleted file mode 100644
index 15b0ed48..00000000
--- a/templates/rhel8/python/python38.dockerfile.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-# setup Python
-ENV PYTHON_VER python3.8
-
-RUN ${PYTHON_VER} -m pip install --upgrade pip
diff --git a/templates/rhel8/python/python39.dockerfile.j2 b/templates/rhel8/python/python39.dockerfile.j2
new file mode 100644
index 00000000..b2473807
--- /dev/null
+++ b/templates/rhel8/python/python39.dockerfile.j2
@@ -0,0 +1,4 @@
+# setup Python
+ENV PYTHON_VER python3.9
+
+RUN ${PYTHON_VER} -m pip install --upgrade pip
\ No newline at end of file
diff --git a/utils/arg_parser.py b/utils/arg_parser.py
index 4566e11a..4a634625 100644
--- a/utils/arg_parser.py
+++ b/utils/arg_parser.py
@@ -116,7 +116,7 @@ def add_build_args(parser: argparse.ArgumentParser):
         parser.add_argument(
             "-py",
             "--python",
-            choices=["python37", "python38", "python310"],
+            choices=["python37", "python38", "python39", "python310", "python311", "python312"],
             help="Python interpreter for docker image, currently default is python38",
         )
 
@@ -519,7 +519,7 @@ def parse_args(name: str, description: str):  # noqa
             if args.os in "ubuntu22":
                 args.python = "python310"
             else:
-                args.python = "python38"
+                args.python = "python39"
 
         if args.python == "python38" and "win" in args.os:
             if not hasattr(args, "pre_stage_msbuild") or not args.pre_stage_msbuild: