From 7f1013f0b81051c0586883d505deb385661a89c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Petrov?= <michael@redhat.com>
Date: Fri, 18 Mar 2022 16:24:19 +0100
Subject: [PATCH 1/3] Try ubi8-minimal base image

---
 image/rhel/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/image/rhel/Dockerfile b/image/rhel/Dockerfile
index 52700d69fb35a..f662a27f94a02 100644
--- a/image/rhel/Dockerfile
+++ b/image/rhel/Dockerfile
@@ -1,8 +1,9 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
-ARG BASE_IMAGE=ubi8/ubi
+ARG BASE_BUNDLE_IMAGE=ubi8
+ARG BASE_IMAGE=ubi8-minimal
 ARG BASE_TAG=8.5
 
-FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
+FROM ${BASE_REGISTRY}/${BASE_BUNDLE_IMAGE}:${BASE_TAG} AS extracted_bundle
 
 COPY bundle.tar.gz /
 WORKDIR /bundle
@@ -38,9 +39,9 @@ RUN ln -s entrypoint-wrapper.sh /stackrox/admission-control && \
     ln -s entrypoint-wrapper.sh /stackrox/sensor-upgrader && \
     ln -s /assets/downloads/cli/roxctl-linux /stackrox/roxctl && \
     rpm --import RPM-GPG-KEY-CentOS-Official && \
-    dnf upgrade -y && \
-    dnf install -y lz4 bzip2 /tmp/snappy.rpm && \
-    dnf clean all && \
+    microdnf upgrade && \
+    rpm -i /tmp/snappy.rpm && \
+    microdnf clean all && \
     rm /tmp/snappy.rpm RPM-GPG-KEY-CentOS-Official && \
     # (Optional) Remove line below to keep package management utilities
     rpm -e --nodeps $(rpm -qa curl '*rpm*' '*dnf*' '*libsolv*' '*hawkey*' 'yum*') && \

From 6c004dcbbc3dd16e496e1cd19a8fa8e98ab09cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Petrov?= <michael@redhat.com>
Date: Fri, 18 Mar 2022 18:19:38 +0100
Subject: [PATCH 2/3] Use ubi8-minimal for the bundle image

---
 image/rhel/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/image/rhel/Dockerfile b/image/rhel/Dockerfile
index f662a27f94a02..180b0dd658359 100644
--- a/image/rhel/Dockerfile
+++ b/image/rhel/Dockerfile
@@ -1,13 +1,12 @@
 ARG BASE_REGISTRY=registry.access.redhat.com
-ARG BASE_BUNDLE_IMAGE=ubi8
 ARG BASE_IMAGE=ubi8-minimal
 ARG BASE_TAG=8.5
 
-FROM ${BASE_REGISTRY}/${BASE_BUNDLE_IMAGE}:${BASE_TAG} AS extracted_bundle
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} AS extracted_bundle
 
 COPY bundle.tar.gz /
 WORKDIR /bundle
-RUN tar -zxf /bundle.tar.gz
+RUN microdnf install tar gzip && tar -zxf /bundle.tar.gz
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -41,6 +40,7 @@ RUN ln -s entrypoint-wrapper.sh /stackrox/admission-control && \
     rpm --import RPM-GPG-KEY-CentOS-Official && \
     microdnf upgrade && \
     rpm -i /tmp/snappy.rpm && \
+    microdnf install lz4 bzip2 && \
     microdnf clean all && \
     rm /tmp/snappy.rpm RPM-GPG-KEY-CentOS-Official && \
     # (Optional) Remove line below to keep package management utilities

From b3a54d29422c777d5d237e1f2ee9eace0fa9fe03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl?= <michael@redhat.com>
Date: Thu, 24 Mar 2022 11:41:26 +0100
Subject: [PATCH 3/3] install findutils to have `find`

---
 image/rhel/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/image/rhel/Dockerfile b/image/rhel/Dockerfile
index 180b0dd658359..1207a37d4e329 100644
--- a/image/rhel/Dockerfile
+++ b/image/rhel/Dockerfile
@@ -40,7 +40,7 @@ RUN ln -s entrypoint-wrapper.sh /stackrox/admission-control && \
     rpm --import RPM-GPG-KEY-CentOS-Official && \
     microdnf upgrade && \
     rpm -i /tmp/snappy.rpm && \
-    microdnf install lz4 bzip2 && \
+    microdnf install lz4 bzip2 findutils && \
     microdnf clean all && \
     rm /tmp/snappy.rpm RPM-GPG-KEY-CentOS-Official && \
     # (Optional) Remove line below to keep package management utilities