Merge pull request kmesh-net#846 from hzxuzhonghu/version-pass

Support passing VERSION to docker when run make docker
zhuwint · Sep 13, 2024 · 7b8bc94 · 7b8bc94
2 parents 56bcc1f + 62b5061
commit 7b8bc94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -143,7 +143,7 @@ uninstall:
 
 .PHONY: build
 build:
-	./kmesh_compile.sh
+	 VERSION=$(VERSION) ./kmesh_compile.sh
 
 .PHONY: docker
 docker: build

diff --git a/hack/utils.sh b/hack/utils.sh
@@ -34,8 +34,8 @@ function get_arch() {
 function build_kmesh() {
     local container_id=$1
     docker exec $container_id git config --global --add safe.directory /kmesh
-    docker exec $container_id sh /kmesh/build.sh
-    docker exec $container_id sh /kmesh/build.sh -i
+    docker exec -e VERSION=$VERSION $container_id sh /kmesh/build.sh
+    docker exec -e VERSION=$VERSION $container_id sh /kmesh/build.sh -i
     docker exec $container_id sh -c "$(declare -f copy_to_host); copy_to_host"
 }