rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00
Code Issues Releases Wiki Activity

Bump Go to 1.7.1

Browse Source
This commit is contained in:
Josh Curl
2016-09-15 22:02:46 -07:00
parent a22075aef2
commit 9e14a9da5a
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.dapper
View File

@@ -94,7 +94,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
DOCKER_VERSION=${DOCKER_VERSION} \ DOCKER_VERSION=${DOCKER_VERSION} \
DOWNLOADS=/usr/src/downloads \ DOWNLOADS=/usr/src/downloads \
GOPATH=/go \ GOPATH=/go \
GO_VERSION=1.6.2 \ GO_VERSION=1.7.1 \
GOARCH=$ARCH \ GOARCH=$ARCH \
HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \ HOSTNAME_DEFAULT=${HOSTNAME_DEFAULT} \
IMAGE_NAME=${IMAGE_NAME} \ IMAGE_NAME=${IMAGE_NAME} \

24
assets/go-dnsclient.patch
View File

@@ -1,24 +1,18 @@
265,270d264 296a297,300
< // Ensure only one update at a time checks resolv.conf.
< if !conf.tryAcquireSema() {
< return
< }
< defer conf.releaseSema()
<
276a271,280
> conf.update(name) > conf.update(name)
> } > }
> >
> func (conf *resolverConfig) update(name string) { > func (conf *resolverConfig) update(name string) {
> // Ensure only one update at a time checks resolv.conf. 300a305,316
> if !conf.tryAcquireSema() {
> return
> }
> defer conf.releaseSema()
>
293a298,302
> } > }
> >
> func UpdateDnsConf() { > func UpdateDnsConf() {
> resolvConf.initOnce.Do(resolvConf.init) > 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") > resolvConf.update("/etc/resolv.conf")