From 1414a4d81e8cee62494cf107f9e851c8a0c04dda Mon Sep 17 00:00:00 2001 From: Joshua Knarr Date: Mon, 7 Oct 2019 09:18:42 -0400 Subject: [PATCH] adding BUILD_ARG --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4b9cb25df3..d80e379537 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,11 @@ # Bump these on release VERSION_MAJOR ?= 0 -VERSION_MINOR ?= 13 +VERSION_MINOR ?= 12 VERSION_BUILD ?= 0 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) +VERSION_PACKAGE = $(REPOPATH/pkg/version) SHELL := /bin/bash GOOS ?= $(shell go env GOOS) @@ -27,7 +28,6 @@ PROJECT := kaniko REGISTRY?=gcr.io/kaniko-project REPOPATH ?= $(ORG)/$(PROJECT) -VERSION_PACKAGE = $(REPOPATH)/pkg/version GO_FILES := $(shell find . -type f -name '*.go' -not -path "./vendor/*") GO_LDFLAGS := '-extldflags "-static" @@ -38,6 +38,7 @@ GO_LDFLAGS += ' EXECUTOR_PACKAGE = $(REPOPATH)/cmd/executor WARMER_PACKAGE = $(REPOPATH)/cmd/warmer KANIKO_PROJECT = $(REPOPATH)/kaniko +BUILD_ARG ?= '' out/executor: $(GO_FILES) GOARCH=$(GOARCH) GOOS=linux CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -o $@ $(EXECUTOR_PACKAGE) @@ -55,6 +56,7 @@ integration-test: .PHONY: images images: - docker build -t $(REGISTRY)/executor:latest -f deploy/Dockerfile . - docker build -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug . - docker build -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer . + docker build ${BUILD_ARG} -t $(REGISTRY)/executor:latest -f deploy/Dockerfile . + docker build ${BUILD_ARG} -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug . + docker build ${BUILD_ARG} -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer . +