Use public images in our Dockerfile by default

Signed-off-by: Julien Ropé <[email protected]>

Dockerfile

@@ -1,8 +1,6 @@
 # Use OpenShift golang builder image
 # These images needs to be synced with the images in the Makefile.
-ARG BUILDER_IMAGE=${BUILDER_IMAGE:-registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17}
-ARG TARGET_IMAGE=${TARGET_IMAGE:-registry.ci.openshift.org/ocp/4.17:base-rhel9}
-FROM ${BUILDER_IMAGE} AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.22.7 AS builder
 
 WORKDIR /workspace
 
@@ -24,7 +22,7 @@ RUN go mod vendor
 RUN make build
 
 # Use OpenShift base image
-FROM ${TARGET_IMAGE}
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 WORKDIR /
 COPY --from=builder /workspace/bin/manager .
 COPY --from=builder /workspace/bin/metrics-server .

Makefile

@@ -63,9 +63,6 @@ else
 GOBIN=$(shell go env GOBIN)
 endif
 
-# These images needs to be synced with the default values in the Dockerfile.
-BUILDER_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
-TARGET_IMAGE  ?= registry.ci.openshift.org/ocp/4.17:base-rhel9
 # CONTAINER_TOOL defines the container tool to be used for building images.
 # Be aware that the target commands are only tested with Docker which is
 # scaffolded by default. However, you might want to replace it to use other
@@ -156,8 +153,6 @@ run: manifests generate fmt vet ## Run a controller from your host.
 docker-build: ## Build docker image with the manager.
 	$(CONTAINER_TOOL) build \
 		-t ${IMG} \
-		--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \
-		--build-arg TARGET_IMAGE=$(TARGET_IMAGE) \
 		.
 
 .PHONY: docker-push
@@ -180,8 +175,6 @@ docker-buildx: ## Build and push docker image for the manager for cross-platform
 	- $(CONTAINER_TOOL) buildx build --push \
 		--platform=$(PLATFORMS) \
 		--tag ${IMG} \
-		--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \
-		--build-arg TARGET_IMAGE=$(TARGET_IMAGE) \
 		-f Dockerfile.cross \
 		.
 	- $(CONTAINER_TOOL) buildx rm project-v3-builder

docs/DEVELOPMENT.md

@@ -25,18 +25,6 @@ In summary:
 - log in from the command line with the provided command
 - use "oc registry login" to save the token locally
 
-### Using public images
-
-If you cannot login to registry.ci.openshift.org, a temporary solution is to use
-public images during build and test. At the time of writing, the following public images
-does the trick.
-
-```shell
-export BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:golang-1.22
-export TARGET_IMAGE=registry.ci.openshift.org/origin/4.17:base-rhel9
-make docker-build
-```
-
 ## Set Environment Variables
 
 Set your quay.io userid