Skip to content

Commit 9e14a9d

Browse files
committed
Bump Go to 1.7.1
1 parent a22075a commit 9e14a9d

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

Dockerfile.dapper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
9494
DOCKER_VERSION=${DOCKER_VERSION} \
9595
DOWNLOADS=/usr/src/downloads \
9696
GOPATH=/go \
97-
GO_VERSION=1.6.2 \
97+
GO_VERSION=1.7.1 \
9898
GOARCH=$ARCH \
9999
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
100100
IMAGE_NAME=${IMAGE_NAME} \

assets/go-dnsclient.patch

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
1-
265,270d264
2-
< // Ensure only one update at a time checks resolv.conf.
3-
< if !conf.tryAcquireSema() {
4-
< return
5-
< }
6-
< defer conf.releaseSema()
7-
<
8-
276a271,280
1+
296a297,300
92
> conf.update(name)
103
> }
114
>
125
> func (conf *resolverConfig) update(name string) {
13-
> // Ensure only one update at a time checks resolv.conf.
14-
> if !conf.tryAcquireSema() {
15-
> return
16-
> }
17-
> defer conf.releaseSema()
18-
>
19-
293a298,302
6+
300a305,316
207
> }
218
>
229
> func UpdateDnsConf() {
2310
> resolvConf.initOnce.Do(resolvConf.init)
11+
>
12+
> // Ensure only one update at a time checks resolv.conf.
13+
> if !resolvConf.tryAcquireSema() {
14+
> return
15+
> }
16+
> defer resolvConf.releaseSema()
17+
>
2418
> resolvConf.update("/etc/resolv.conf")

0 commit comments

Comments
 (0)