mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Merge pull request #1046 from erikwilson/fix-dns
Go DNS lookup order hack
This commit is contained in:
commit
4afc14df0c
@ -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
|
||||
|
@ -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="
|
||||
|
Loading…
Reference in New Issue
Block a user