From e90c5d45b3ceefd8fc16743a1fe4c113b196323c Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@hyper.sh>
Date: Wed, 29 Apr 2020 19:20:42 -0700
Subject: [PATCH] runtime: build with vendor

So that we don't have to download dependencies.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
---
 src/runtime/Makefile                | 4 ++--
 src/runtime/virtcontainers/Makefile | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/runtime/Makefile b/src/runtime/Makefile
index bff880631..b496ee906 100644
--- a/src/runtime/Makefile
+++ b/src/runtime/Makefile
@@ -486,7 +486,7 @@ ifneq ($(FEATURE_SELINUX),no)
 endif
 
 # go build common flags
-BUILDFLAGS := -buildmode=pie ${BUILDTAGS}
+BUILDFLAGS := -buildmode=pie -mod=vendor ${BUILDTAGS}
 
 # whether stipping the binary
 ifeq ($(STRIP),yes)
@@ -561,7 +561,7 @@ $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
 	$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)
 
 $(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
-	$(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) -i -o $@ .)
+	$(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)
 
 .PHONY: \
 	check \
diff --git a/src/runtime/virtcontainers/Makefile b/src/runtime/virtcontainers/Makefile
index 9560c6e0f..a848b7a18 100644
--- a/src/runtime/virtcontainers/Makefile
+++ b/src/runtime/virtcontainers/Makefile
@@ -13,6 +13,7 @@ HOOK_BIN := hook
 KATA_SHIM_DIR := shim/mock/kata-shim
 KATA_SHIM_BIN := kata-shim
 MK_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+GOBUILD_FLAGS := -mod=vendor
 
 #
 # Pretty printing
@@ -29,13 +30,13 @@ QUIET_GOBUILD = $(Q:@=@echo    '     GOBUILD  '$@;)
 all: build binaries
 
 build:
-	$(QUIET_GOBUILD)go build $(go list ./... | grep -v /vendor/)
+	$(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) $(go list ./... | grep -v /vendor/)
 
 hook:
-	$(QUIET_GOBUILD)go build -o $(HOOK_DIR)/$@ $(HOOK_DIR)/*.go
+	$(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) -o $(HOOK_DIR)/$@ $(HOOK_DIR)/*.go
 
 kata-shim:
-	$(QUIET_GOBUILD)go build -o $(KATA_SHIM_DIR)/$@ $(KATA_SHIM_DIR)/*.go
+	$(QUIET_GOBUILD)go build $(GOBUILD_FLAGS) -o $(KATA_SHIM_DIR)/$@ $(KATA_SHIM_DIR)/*.go
 
 binaries: hook kata-shim