Permalink
Browse files

Bump Go to 1.7.1

  • Loading branch information...
1 parent a22075a commit 9e14a9da5abb02201714f026b14ace59048980ec @joshwget joshwget committed Sep 16, 2016
Showing with 10 additions and 16 deletions.
  1. +1 −1 Dockerfile.dapper
  2. +9 −15 assets/go-dnsclient.patch
View
@@ -94,7 +94,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
DOCKER_VERSION=${DOCKER_VERSION} \
DOWNLOADS=/usr/src/downloads \
GOPATH=/go \
- GO_VERSION=1.6.2 \
+ GO_VERSION=1.7.1 \
GOARCH=$ARCH \
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
IMAGE_NAME=${IMAGE_NAME} \
@@ -1,24 +1,18 @@
-265,270d264
-< // Ensure only one update at a time checks resolv.conf.
-< if !conf.tryAcquireSema() {
-< return
-< }
-< defer conf.releaseSema()
-<
-276a271,280
+296a297,300
> conf.update(name)
> }
>
> func (conf *resolverConfig) update(name string) {
-> // Ensure only one update at a time checks resolv.conf.
-> if !conf.tryAcquireSema() {
-> return
-> }
-> defer conf.releaseSema()
->
-293a298,302
+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")

0 comments on commit 9e14a9d

Please sign in to comment.