diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 00e2803d..527b5188 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -138,7 +138,6 @@ RUN echo "... Downloading ${!KERNEL_URL}"; \ RUN curl -pfL ${SELINUX_POLICY_URL} > ${DOWNLOADS}/$(basename ${SELINUX_POLICY_URL}) # Install Go -COPY assets/go-dnsclient.patch ${DAPPER_SOURCE} RUN ln -sf go-6 /usr/bin/go && \ curl -sfL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz | tar -xzf - -C /usr/local && \ cd /usr/local/go/src && \ diff --git a/assets/go-dnsclient.patch b/assets/go-dnsclient.patch deleted file mode 100644 index 4c50706f..00000000 --- a/assets/go-dnsclient.patch +++ /dev/null @@ -1,18 +0,0 @@ -296a297,300 -> conf.update(name) -> } -> -> func (conf *resolverConfig) update(name string) { -300a305,316 -> } -> -> func UpdateDnsConf() { -> resolvConf.initOnce.Do(resolvConf.init) -> -> // Ensure only one update at a time checks resolv.conf. -> if !resolvConf.tryAcquireSema() { -> return -> } -> defer resolvConf.releaseSema() -> -> resolvConf.update("/etc/resolv.conf") diff --git a/scripts/build-target b/scripts/build-target index 34524caa..d6376996 100755 --- a/scripts/build-target +++ b/scripts/build-target @@ -17,4 +17,4 @@ echo Building $OUTPUT BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') 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='${BUILDDATE}' -X github.com/docker/docker/dockerversion.IAmStatic=true -X github.com/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO} -X github.com/rancher/os/config.BuildDate='${BUILDDATE}'" -go build -tags "selinux cgo daemon netgo dnspatch" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static -s -w" -o ${OUTPUT} +go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static -s -w" -o ${OUTPUT}