Base on UBI minimal image with python38 added vs python39 UBI (IBM#86)

* Base on minimal vs python39 UBI * use tested version - python38 Co-authored-by: Timothy Figgins <[email protected]>
srmeier · Apr 20, 2022 · be36fb7 · be36fb7
1 parent e5a07ee
commit be36fb7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfiles/base/00.python-redhat-ubi.Dockerfile b/Dockerfiles/base/00.python-redhat-ubi.Dockerfile
@@ -1,5 +1,7 @@
-FROM registry.access.redhat.com/ubi8/python-39
+FROM registry.access.redhat.com/ubi8-minimal
 LABEL maintainer="squad:git-defenders" url="https://github.ibm.com/whitewater/whitewater-detect-secrets"
 
 User root
-RUN yum -y update
+# install python 3.8 and corresponding pip ... install git (used in DS scan)
+RUN microdnf -y install python38 python38-pip git
+RUN microdnf -y update
diff --git a/Dockerfiles/detect-secrets/01.detect-secrets-redhat-ubi.Dockerfile b/Dockerfiles/detect-secrets/01.detect-secrets-redhat-ubi.Dockerfile
@@ -5,10 +5,7 @@ COPY setup.py /code/
 COPY setup.cfg /code/
 COPY detect_secrets /code/detect_secrets
 
-RUN pip install /code
-
-# Ensure no trivy violation for pip
-RUN pip install --upgrade pip
+RUN pip3 install /code
 
 WORKDIR /code