ubi8 use pip for docker module

- added more repos (gpertools-libs)

partial-jira-bug: CEM-24319
Change-Id: If51441063b7cf233582bcc2233c04ba24279aede

Author: alexey-mr

containers/nodemgr/Dockerfile

@@ -14,13 +14,8 @@ LABEL name=$CONTAINER_NAME \
 # for building from rpms
 # install chrony, ntp and iputils-clockdiff to enable checking time sync by nodemgr
 RUN   \
-      pkgs="contrail-nodemgr python2-docker-2.4.2-1.2.el7.noarch chrony python3-contrail podman" && \
-      source /etc/os-release && \
-      if [[ "$ID" != 'rhel' || "$VERSION_ID" != '8.4' ]] ; then \ 
-            pkgs+=" ntp" ; \
-      fi && \
-      yum install -y $pkgs && \
-      python2 -m pip install --no-compile grpcio==1.29.0 protobuf==3.12.1 && \
+      yum install -y contrail-nodemgr python3-contrail chrony podman && \
+      python2 -m pip install --no-compile "docker==2.4.2" "grpcio==1.29.0" "protobuf==3.12.1" && \
       yum clean all -y && \
       rm -rf /var/cache/yum
 

containers/status/Dockerfile

@@ -10,10 +10,10 @@ LABEL name=$CONTAINER_NAME \
       $VENDOR_DOMAIN".container.name"=$CONTAINER_NAME
 
 RUN \
-    yum install -y python2-docker podman contrail-nodemgr && \
+    yum install -y podman contrail-nodemgr && \
     yum clean all -y && \
     rm -rf /var/cache/yum && \
-    python2 -m pip install --no-compile "grpcio==1.29.0" "protobuf==3.12.1"
+    python2 -m pip install --no-compile "docker==2.4.2" "grpcio==1.29.0" "protobuf==3.12.1"
 
 COPY contrail-status.py /root
 COPY entrypoint.sh /

parse-env.sh

@@ -129,6 +129,7 @@ if [[ "$LINUX_DISTR" =~ 'rhel' ]] ; then
       RHEL_HOST_REPOS+=",codeready-builder-for-rhel-8-x86_64-rpms"
       RHEL_HOST_REPOS+=",openstack-$rhel_os_repo_num-for-rhel-8-x86_64-rpms"
       RHEL_HOST_REPOS+=",ansible-2-for-rhel-8-x86_64-rpms"
+      RHEL_HOST_REPOS+=",rhocp-4.6-for-rhel-8-x86_64-rpms"
     else
       # generic repos
       RHEL_HOST_REPOS+=",rhel-7-server-rpms,rhel-7-server-extras-rpms,rhel-7-server-optional-rpms"