From 88a6c9e9ad29fec47cf0991c1e823d93ba7bc9b3 Mon Sep 17 00:00:00 2001
From: kimorris27 <kimorris@redhat.com>
Date: Thu, 2 Jul 2026 09:44:55 -0500
Subject: [PATCH 1/2] Fix Dockerfile FROM directive in local image builds

---
 Dockerfile.aro | 2 +-
 Makefile       | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.aro b/Dockerfile.aro
index 7896820da..0cbc76713 100644
--- a/Dockerfile.aro
+++ b/Dockerfile.aro
@@ -4,7 +4,7 @@ ARG REGISTRY=registry.access.redhat.com
 ARG REPOSITORY=ubi9/ubi-minimal
 ARG TAG=latest
 ARG BUILDER_REGISTRY=registry.ci.openshift.org
-ARG BUILDER_REPOSITORY=ocp/builder
+ARG BUILDER_REPOSITORY=openshift-release-dev/golang-builder--partner-share
 ARG BUILDER_TAG=rhel-9-golang-1.25-openshift-4.21
 FROM ${BUILDER_REGISTRY}/${BUILDER_REPOSITORY}:${BUILDER_TAG} AS builder
 
diff --git a/Makefile b/Makefile
index 5e08c7c78..ab56cd2f8 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,16 @@ else
 endif
 
 # default to registry.access.redhat.com for build images on local builds and CI builds without $RP_IMAGE_ACR set.
+BUILDER_REPOSITORY = openshift-release-dev/golang-builder--partner-share
 ifeq ($(RP_IMAGE_ACR),arointsvc)
 	REGISTRY = arointsvc.azurecr.io
-	BUILDER_REGISTRY = arointsvc.azurecr.io/openshift-release-dev/golang-builder--partner-share
+	BUILDER_REGISTRY = arointsvc.azurecr.io
 else ifeq ($(RP_IMAGE_ACR),arosvc)
 	REGISTRY = arosvc.azurecr.io
-	BUILDER_REGISTRY = arosvc.azurecr.io/openshift-release-dev/golang-builder--partner-share
+	BUILDER_REGISTRY = arosvc.azurecr.io
 else
 	REGISTRY ?= registry.access.redhat.com
-	BUILDER_REGISTRY ?= quay.io/openshift-release-dev/golang-builder--partner-share
+	BUILDER_REGISTRY ?= quay.io
 endif
 
 ARO_IMAGE ?= $(ARO_IMAGE_BASE):$(VERSION)
@@ -49,7 +50,7 @@ generate: install-tools
 .PHONY: image-aro
 image-aro:
 	docker pull $(REGISTRY)/ubi9/ubi-minimal
-	docker build --platform=linux/amd64 --network=host --no-cache -f Dockerfile.aro -t $(ARO_IMAGE) --build-arg REGISTRY=$(REGISTRY) --build-arg BUILDER_REGISTRY=$(BUILDER_REGISTRY) .
+	docker build --platform=linux/amd64 --network=host --no-cache -f Dockerfile.aro -t $(ARO_IMAGE) --build-arg REGISTRY=$(REGISTRY) --build-arg BUILDER_REGISTRY=$(BUILDER_REGISTRY) --build-arg BUILDER_REPOSITORY=$(BUILDER_REPOSITORY) .
 
 .PHONY: publish-image-aro
 publish-image-aro: image-aro

From aa8d7c4086d0d84d787b9ebeaabf88cc7ec0a196 Mon Sep 17 00:00:00 2001
From: kimorris27 <kimorris@redhat.com>
Date: Thu, 2 Jul 2026 10:28:24 -0500
Subject: [PATCH 2/2] Restore `ocp/builder` default value for repo

Apparently this is what it's stored under for Prow CI purposes, and Prow is using the default value from the Dockerfile...
---
 Dockerfile.aro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.aro b/Dockerfile.aro
index 0cbc76713..7896820da 100644
--- a/Dockerfile.aro
+++ b/Dockerfile.aro
@@ -4,7 +4,7 @@ ARG REGISTRY=registry.access.redhat.com
 ARG REPOSITORY=ubi9/ubi-minimal
 ARG TAG=latest
 ARG BUILDER_REGISTRY=registry.ci.openshift.org
-ARG BUILDER_REPOSITORY=openshift-release-dev/golang-builder--partner-share
+ARG BUILDER_REPOSITORY=ocp/builder
 ARG BUILDER_TAG=rhel-9-golang-1.25-openshift-4.21
 FROM ${BUILDER_REGISTRY}/${BUILDER_REPOSITORY}:${BUILDER_TAG} AS builder