diff --git a/scripts/build-target b/scripts/build-target index fc7536b1..ec1da281 100755 --- a/scripts/build-target +++ b/scripts/build-target @@ -16,5 +16,5 @@ OUTPUT=${OUTPUT:-bin/ros} echo Building $OUTPUT CONST="-X github.com/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.VERSION=${VERSION}" -go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT} +go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static" -o ${OUTPUT} strip --strip-all ${OUTPUT} diff --git a/util/network/network.go b/util/network/network.go index 7b40bc29..461145f4 100644 --- a/util/network/network.go +++ b/util/network/network.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io/ioutil" - "net" "net/http" "os" "strings" @@ -87,7 +86,7 @@ func loadFromNetwork(location string) ([]byte, error) { var err error for i := 0; i < 300; i++ { - net.UpdateDnsConf() + updateDNSCache() var resp *http.Response resp, err = http.Get(location) diff --git a/util/network/update_dns_cache.go b/util/network/update_dns_cache.go new file mode 100644 index 00000000..96c15d86 --- /dev/null +++ b/util/network/update_dns_cache.go @@ -0,0 +1,9 @@ +// +build dnspatch + +package network + +import "net" + +func updateDNSCache() { + net.UpdateDnsConf() +} diff --git a/util/network/update_dns_cache_patched.go b/util/network/update_dns_cache_patched.go new file mode 100644 index 00000000..a41e17d9 --- /dev/null +++ b/util/network/update_dns_cache_patched.go @@ -0,0 +1,5 @@ +// +build !dnspatch + +package network + +func updateDNSCache() {}