From 5dd32c5c346a546a455820d9c3a8ee6453cd9c25 Mon Sep 17 00:00:00 2001 From: Gus Rivera Date: Wed, 25 Sep 2024 13:04:13 -0500 Subject: [PATCH] Propagating MAKEFLAGS to support tagless builds (#46606) * Propagating makeflags for nightly release * Trying recusrive submake in container * Propagating makeflags another way * More propagation * Trying MAKEFLAGS as an env var * Have specify MAKEFLAGS * Typod a paranthesis * Moving makeflags env flag for docker to the targets * Typo * Previous try had a typo didn't catch but should work now --- build.assets/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.assets/Makefile b/build.assets/Makefile index 9ae9eacf515f..8b633a6f8f75 100644 --- a/build.assets/Makefile +++ b/build.assets/Makefile @@ -8,7 +8,7 @@ HOSTNAME=buildbox SRCDIR=/go/src/github.com/gravitational/teleport GOMODCACHE ?= /tmp/gomodcache # TODO(hugoShaka) remove HELM_PLUGINS with teleport13 buildbox -DOCKERFLAGS := --rm=true -v "$$(pwd)/../":$(SRCDIR) -v /tmp:/tmp -w $(SRCDIR) -h $(HOSTNAME) -e GOMODCACHE=$(GOMODCACHE) -e HELM_PLUGINS=/home/ci/.local/share/helm/plugins-new +DOCKERFLAGS := --rm=true -v "$$(pwd)/../":$(SRCDIR) -v /tmp:/tmp -w $(SRCDIR) -h $(HOSTNAME) -e GOMODCACHE=$(GOMODCACHE) -e HELM_PLUGINS=/home/ci/.local/share/helm/plugins-new -e MAKEFLAGS # Teleport version - some targets require this to be set VERSION ?= $(shell egrep ^VERSION ../Makefile | cut -d= -f2)