Skip to content

Fix Dockerfile FROM directive in local image builds #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kimorris27 wants to merge 2 commits into
base: release-4.21
Choose a base branch
from
Open

Fix Dockerfile FROM directive in local image builds #441

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a6c9e
Fix Dockerfile FROM directive in local image builds
kimorris27 Jul 2, 2026
aa8d7c4
Restore `ocp/builder` default value for repo
kimorris27 Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down