From 58c9b6d34f6fdc39c07498637b898025ec8c9f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CLavanya?= <l.sirigudi@f5.com>
Date: Thu, 6 Jan 2022 20:07:05 +0530
Subject: [PATCH] python upgrade and move to ubi7

---
 build-tools/Dockerfile.debian |  2 +-
 build-tools/Dockerfile.debug  |  2 +-
 build-tools/Dockerfile.ubi    | 10 +++++++---
 next-version.txt              |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build-tools/Dockerfile.debian b/build-tools/Dockerfile.debian
index 3c1a1b27..6244c0aa 100644
--- a/build-tools/Dockerfile.debian
+++ b/build-tools/Dockerfile.debian
@@ -14,7 +14,7 @@ COPY . .
 
 RUN $REPOPATH/build-tools/rel-build.sh
 
-FROM python:3.6-slim-buster
+FROM python:3.10-slim-buster
 
 
 ENV APPPATH /app
diff --git a/build-tools/Dockerfile.debug b/build-tools/Dockerfile.debug
index fe0e3a82..b0feb918 100644
--- a/build-tools/Dockerfile.debug
+++ b/build-tools/Dockerfile.debug
@@ -14,7 +14,7 @@ RUN $REPOPATH/build-tools/rel-build.sh && \
     go get github.com/go-delve/delve/cmd/dlv
 
 
-FROM python:3.6-slim-buster
+FROM python:3.10-slim-buster
 
 ENV APPPATH /app
 
diff --git a/build-tools/Dockerfile.ubi b/build-tools/Dockerfile.ubi
index 4909555f..67204219 100644
--- a/build-tools/Dockerfile.ubi
+++ b/build-tools/Dockerfile.ubi
@@ -16,7 +16,7 @@ RUN $REPOPATH/build-tools/rel-build.sh && \
     apt-get update && apt-get install -y go-md2man && \
 	go-md2man -in $REPOPATH/build-tools/help.md  -out /help.1
 
-FROM registry.redhat.io/ubi8/ubi-minimal
+FROM registry.redhat.io/ubi7/ubi-minimal
 
 LABEL name="f5networks/f5-ipam-controller" \
       vendor="F5 Networks" \
@@ -45,8 +45,12 @@ COPY --from=builder "/help.1" /
 COPY LICENSE /licenses/
 
 RUN microdnf update && \
-    microdnf --enablerepo=ubi-8-baseos install --nodocs python36 git shadow-utils && \
-    microdnf --enablerepo=ubi-8-baseos --enablerepo=ubi-8-appstream update nss-tools nss-softokn nss-util && \
+    microdnf --enablerepo=ubi-7-server-devtools-rpms --enablerepo=ubi-7-server-extras-rpms  \
+    --enablerepo=ubi-7-server-optional-rpms --enablerepo=ubi-server-rhscl-7-rpms \
+    install --nodocs git shadow-utils && \
+    microdnf --enablerepo=ubi-7-server-devtools-rpms --enablerepo=ubi-7-server-extras-rpms \
+    --enablerepo=ubi-7-server-optional-rpms --enablerepo=ubi-server-rhscl-7-rpms \
+    update nss-tools nss-softokn nss-util && \
     adduser -u 1200 ctlr && \
     microdnf remove  fipscheck fipscheck-lib libgnome-keyring libedit openssh openssh-clients \
     perl-Git  perl-TermReadKey  perl-macros git-core git-core-doc git less \
diff --git a/next-version.txt b/next-version.txt
index c946ee61..11808190 100644
--- a/next-version.txt
+++ b/next-version.txt
@@ -1 +1 @@
-0.1.6
+0.1.7