Merge pull request #60 from dweomer/netgo-and-cni

netcgo is a no go

Author: dweomer

Dockerfile

@@ -54,7 +54,7 @@ FROM build AS cni
 ARG CGO_ENABLED=0
 ARG GOBIN=/opt/k3c/bin
 ARG GOPATH=/go
-ARG CNIPLUGINS_VERSION="v0.7.6-k3s1"
+ARG CNIPLUGINS_VERSION="v0.8.6-k3s1"
 ARG CNIPLUGINS_PACKAGE=github.com/rancher/plugins
 ARG CNIPLUGINS_LDFLAGS="-w -s"
 ARG CNIPLUGINS_EXTRA_LDFLAGS="-static"

Makefile

@@ -68,7 +68,7 @@ endif
 ifdef BUILDTAGS
     GO_BUILDTAGS = ${BUILDTAGS}
 else
-	GO_BUILDTAGS = apparmor seccomp selinux netcgo osusergo static_build no_btrfs
+	GO_BUILDTAGS = apparmor seccomp selinux netgo osusergo static_build no_btrfs
 endif
 GO_BUILDTAGS += ${DEBUG_TAGS}
 GO_TAGS=$(if $(GO_BUILDTAGS),-tags "$(GO_BUILDTAGS)",)