Merge pull request #1046 from erikwilson/fix-dns

pkg/cli/cmds/root.go

@@ -2,6 +2,7 @@ package cmds
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
@@ -12,6 +13,13 @@ var (
 	debug bool
 )
 
+func init() {
+	// hack - force "file,dns" lookup order if go dns is used
+	if os.Getenv("RES_OPTIONS") == "" {
+		os.Setenv("RES_OPTIONS", " ")
+	}
+}
+
 func NewApp() *cli.App {
 	app := cli.NewApp()
 	app.Name = appName

scripts/build

@@ -33,7 +33,7 @@ fi
 STATIC_SQLITE="
     -extldflags '-static -lm -ldl -lz -lpthread $DQLITE_STATIC_SQLITE'
 "
-TAGS="ctrd apparmor seccomp no_btrfs netgo osusergo providerless $DQLITE_TAGS"
+TAGS="ctrd apparmor seccomp no_btrfs netcgo osusergo providerless $DQLITE_TAGS"
 
 if [ "$STATIC_BUILD" != "true" ]; then
     STATIC="