From d97885b6c3c3d93a3db4cec09a035f00cdd49129 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Tue, 1 Oct 2024 16:13:55 -0400 Subject: [PATCH] Makefile: Add BUILDX_PUSH var Signed-off-by: Tiger Kaovilai --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index be8b30de4a..51eab5c889 100644 --- a/Makefile +++ b/Makefile @@ -94,13 +94,15 @@ define BUILDX_ERROR buildx not enabled, refusing to run this recipe see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-velero for more info endef - +# comma cannot be escaped and can only be used in Make function arguments by putting into variable +comma=, # The version of restic binary to be downloaded RESTIC_VERSION ?= 0.15.0 CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH)) -BUILDX_OUTPUT_TYPE ?= image +BUILDX_PUSH ?= false +BUILDX_OUTPUT_TYPE ?= image$(subst false,,$(subst true,$(comma)push=true,$(BUILDX_PUSH))) # set git sha and tree state GIT_SHA = $(shell git rev-parse HEAD) @@ -196,7 +198,7 @@ container: ifneq ($(BUILDX_ENABLED), true) $(error $(BUILDX_ERROR)) endif - @docker buildx build --pull \ + docker buildx build --pull \ --output=type=$(BUILDX_OUTPUT_TYPE) \ --platform $(BUILDX_PLATFORMS) \ $(addprefix -t , $(IMAGE_TAGS)) \