Skip to content

Commit

Permalink
Make sure to use vendoring for containerd-shim
Browse files Browse the repository at this point in the history
  • Loading branch information
@afbjorklund
afbjorklund committed Jul 15, 2020
1 parent 87c6b5a commit 2196581
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions external/package/k3s/k3s.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ endif
define K3S_BUILD_CMDS
cd $(@D) && $(K3S_MAKE_ENV) \
$(GO_BIN) build -mod vendor -tags "$(K3S_TAGS)" -ldflags "$(K3S_LDFLAGS)" -o bin/containerd ./cmd/server/main.go
$(K3S_MAKE_ENV) make -C $(@D)/vendor/github.com/containerd/containerd bin/containerd-shim
$(K3S_MAKE_ENV) make -C $(@D)/vendor/github.com/containerd/containerd bin/containerd-shim-runc-v2
$(K3S_MAKE_ENV) GO_BUILD_FLAGS="-mod vendor" make -C $(@D)/vendor/github.com/containerd/containerd bin/containerd-shim
$(K3S_MAKE_ENV) GO_BUILD_FLAGS="-mod vendor" make -C $(@D)/vendor/github.com/containerd/containerd bin/containerd-shim-runc-v2
endef

define K3S_INSTALL_TARGET_CMDS
Expand Down

0 comments on commit 2196581

Please sign in to comment.