From dca6a22f3f4ee4b3e6ea04ecfd213d5f4a754880 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 11 Nov 2019 22:19:39 +0000 Subject: [PATCH] Don't build cni on each ./scripts/build invocation --- scripts/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index eb83bdc588..45dc22ac94 100755 --- a/scripts/build +++ b/scripts/build @@ -48,7 +48,6 @@ rm -f \ bin/k3s-agent \ bin/hyperkube \ bin/containerd \ - bin/cni \ bin/runc \ bin/containerd-shim \ bin/containerd-shim-runc-v1 \ @@ -65,6 +64,7 @@ cleanup() { } INSTALLBIN=$(pwd)/bin +if [ ! -x ${INSTALLBIN}/cni ]; then ( echo Building cni TMPDIR=$(mktemp -d) @@ -74,6 +74,7 @@ INSTALLBIN=$(pwd)/bin cd $WORKDIR GOPATH=$TMPDIR CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni ) +fi # echo Building agent # CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go echo Building server