Images: Rework. (1/3) (#13014)

Co-authored-by: Marco Ebert <marco_ebert@icloud.com>

images/Makefile

@@ -1,4 +1,4 @@
-# Copyright 2024 The Kubernetes Authors.
+# Copyright 2025 The Kubernetes Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,75 +12,51 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.DEFAULT_GOAL:=build
-
-# set default shell
-SHELL=/bin/bash -o pipefail -o errexit
-
-DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
-INIT_BUILDX=$(DIR)/../hack/init-buildx.sh
-
-
-BASE_IMAGE = $(shell cat $(DIR)/../NGINX_BASE)
-
-# The env below is called GO_VERSION and not GOLANG_VERSION because 
-# the gcb image we use to build already defines GOLANG_VERSION and is a 
-# really old version
-GO_VERSION = $(shell cat $(DIR)/../GOLANG_VERSION)
-
-REGISTRY ?= local
 NAME ?=
 
-IMAGE = $(REGISTRY)/$(NAME)
+BUILDER ?= ingress-nginx
+PLATFORMS ?= linux/amd64,linux/arm,linux/arm64
+REGISTRY ?= us-central1-docker.pkg.dev/k8s-staging-images/ingress-nginx
+IMAGE ?= $(REGISTRY)/$(NAME)
 TAG ?= $(shell cat $(NAME)/TAG)
 
+DIR = $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+BASE_IMAGE ?= $(shell cat $(DIR)/../NGINX_BASE)
+GOLANG_VERSION ?= $(shell cat $(DIR)/../GOLANG_VERSION)
 EXTRAARGS ?= $(shell cat $(NAME)/EXTRAARGS)
 
+.PHONY: builder
+builder:
+	docker buildx create --name $(BUILDER) --bootstrap || :
+	docker buildx inspect $(BUILDER)
 
-# required to enable buildx
-export DOCKER_CLI_EXPERIMENTAL=enabled
-
-# build with buildx
-PLATFORMS?=linux/amd64,linux/arm,linux/arm64
-OUTPUT=
-PROGRESS=plain
-
-
-precheck:
-ifndef NAME
-	$(error NAME variable is required)
-endif
-
-build: precheck ensure-buildx
+.PHONY: build
+build: builder
 	docker buildx build \
-		--label=org.opencontainers.image.source=https://github.com/kubernetes/ingress-nginx \
-		--label=org.opencontainers.image.licenses=Apache-2.0 \
-		--label=org.opencontainers.image.description="Ingress NGINX $(NAME) image" \
+		--builder $(BUILDER) \
+		--platform $(PLATFORMS) \
+		--label org.opencontainers.image.description="Ingress NGINX $(NAME)" \
+		--label org.opencontainers.image.source="https://github.com/kubernetes/ingress-nginx" \
+		--label org.opencontainers.image.licenses="Apache-2.0" \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
-		--build-arg GOLANG_VERSION=$(GO_VERSION) \
-		--platform=${PLATFORMS} $(OUTPUT) \
-		--progress=$(PROGRESS) \
-		--pull $(EXTRAARGS) \
-		-t $(IMAGE):$(TAG) $(NAME)/rootfs
+		--build-arg GOLANG_VERSION=$(GOLANG_VERSION) \
+		$(EXTRAARGS) \
+		$(NAME)/rootfs \
+		--tag $(IMAGE):$(TAG) \
+		$(OUTPUT)
 
-# push the cross built image
-push: OUTPUT=--push
+.PHONY: push
+push: OUTPUT = --push
 push: build
 
-test: precheck
+.PHONY: test
+test:
 	cd $(NAME)/rootfs && go test ./...
 
-test-e2e: precheck
-	cd $(NAME) && ./hack/e2e.sh
+.PHONY: test-e2e
+test-e2e:
+	cd $(NAME) && hack/e2e.sh
 
-# enable buildx
-ensure-buildx:
-# this is required for cloudbuild
-ifeq ("$(wildcard $(INIT_BUILDX))","")
-	@curl -sSL https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/hack/init-buildx.sh | bash
-else
-	@exec $(INIT_BUILDX)
-endif
-	@echo "done"
-
-.PHONY: build push ensure-buildx test test-e2e precheck
+.PHONY: clean
+clean:
+	docker buildx rm $(BUILDER) || :