From 573f436f145053a59fc87e18fdfff0b9303ff4a0 Mon Sep 17 00:00:00 2001
From: Siu Wa Wu <siwu@redhat.com>
Date: Tue, 26 May 2026 11:08:47 +1000
Subject: [PATCH 1/2] change Dockerfile to use harden images

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 46cbea4c..4db045fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
 # This is for CI test and should build on x86_64 environment
 
-FROM registry.access.redhat.com/ubi9:9.8 as base
+FROM registry.access.redhat.com/hi/go:1.25-fips-builder as base
 
 ### Pre-install dependencies
 # These packages will end up in the final image
 # Installed here to save build time
-RUN yum --assumeyes install \
+RUN dnf --assumeyes install \
     jq \
-    && yum clean all;
+    && dnf clean all;
 
 ### Build backplane-cli
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 as bp-cli-builder
+FROM registry.access.redhat.com/hi/go:1.25-fips-builder as bp-cli-builder
 
 
 # Configure the env
@@ -35,7 +35,7 @@ RUN cp ./ocm-backplane /out
 RUN chmod -R +x /out
 
 ### Build dependencies
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 as dep-builder
+FROM registry.access.redhat.com/hi/go:1.25-fips-builder as dep-builder
 
 # Ensure we can use Go version as we want
 ENV GOTOOLCHAIN=go1.25.3+auto
@@ -58,8 +58,8 @@ RUN mkdir /out
 RUN mkdir /oc
 WORKDIR /oc
 
-# Download jq packages 
-RUN curl -sSLo /usr/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x /usr/bin/jq
+# Install tools
+RUN dnf --assumeyes install gawk jq tar which gzip
 
 # Download the checksum
 RUN curl -sSLf ${OC_URL}/sha256sum.txt -o sha256sum.txt

From 8788ad59a331b1692f8fe68dca18ad30d9368b90 Mon Sep 17 00:00:00 2001
From: Siu Wa Wu <siwu@redhat.com>
Date: Tue, 26 May 2026 11:43:15 +1000
Subject: [PATCH 2/2] clean up dnf cache

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4db045fe..8c0ab403 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,7 +59,8 @@ RUN mkdir /oc
 WORKDIR /oc
 
 # Install tools
-RUN dnf --assumeyes install gawk jq tar which gzip
+RUN dnf --assumeyes install gawk jq tar which gzip \
+    && dnf clean all;
 
 # Download the checksum
 RUN curl -sSLf ${OC_URL}/sha256sum.txt -o sha256sum.txt