Support running make commands from within the build container

kanisterio · Apr 9, 2024 · ba8e67b · ba8e67b
1 parent f97d6c3
commit ba8e67b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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"                                 \