From ba8e67b13e0c37b68b916f5ad87b0f52c01776e6 Mon Sep 17 00:00:00 2001
From: Daniil Fedotov <daniil.fedotov@kasten.io>
Date: Tue, 9 Apr 2024 16:48:09 -0400
Subject: [PATCH] Support running make commands from within the build container

---
 Makefile               | 2 +-
 build/run_container.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index debae09e875..024e2c35efe 100644
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ ifeq ($(DOCKER_BUILD),"true")
 	@echo "running CMD in the containerized build environment"
 	@PWD=$(PWD) ARCH=$(ARCH) PKG=$(PKG) GITHUB_TOKEN=$(GITHUB_TOKEN) CMD="$(CMD)" /bin/bash ./build/run_container.sh run
 else
-	@/bin/bash $(CMD)
+	@/bin/bash -c "$(CMD)"
 endif
 
 clean: dotfile-clean bin-clean
diff --git a/build/run_container.sh b/build/run_container.sh
index d2618a68646..c11c29eaac2 100755
--- a/build/run_container.sh
+++ b/build/run_container.sh
@@ -23,7 +23,7 @@ set -o nounset
 PWD="${PWD:-$(pwd)}"
 
 DOCS_BUILD_IMAGE="${DOCS_BUILD_IMAGE:-ghcr.io/kanisterio/docker-sphinx:0.2.0}"
-BUILD_IMAGE="${BUILD_IMAGE:-ghcr.io/kanisterio/build:v0.0.28}"
+BUILD_IMAGE="${BUILD_IMAGE:-ghcr.io/kanisterio/build:v0.0.28-reno}"
 PKG="${PKG:-github.com/kanisterio/kanister}"
 
 ARCH="${ARCH:-amd64}"
@@ -64,6 +64,7 @@ run_build_container() {
       --rm                                                        \
       --net host                                                  \
       -e GITHUB_TOKEN="${github_token}"                           \
+      -e DOCKER_BUILD="false"                                     \
       ${minikube_dir_binding}                                     \
       -v "${HOME}/.kube:/root/.kube"                              \
       -v "${PWD}/.go/pkg:/go/pkg"                                 \