Merge pull request #2672 from dgageot/golang-1.5.2

FIX #2670 Upgrade to go 1.5.2
This commit is contained in:
Jean-Laurent de Morlhon 2015-12-23 16:19:58 +01:00
commit 5bb3d901b9
4 changed files with 5 additions and 5 deletions

View File

@ -18,7 +18,7 @@ guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
The requirements to build Machine are: The requirements to build Machine are:
1. A running instance of Docker or a Golang 1.5 development environment 1. A running instance of Docker or a Golang 1.5.2 development environment
2. The `bash` shell 2. The `bash` shell
3. [Make](https://www.gnu.org/software/make/) 3. [Make](https://www.gnu.org/software/make/)
@ -29,7 +29,7 @@ To build the `docker-machine` binary using containers, simply run:
$ export USE_CONTAINER=true $ export USE_CONTAINER=true
$ make build $ make build
## Local Go 1.5 development environment ## Local Go development environment
Make sure the source code directory is under a correct directory structure to use Go 1.5 vendoring; Make sure the source code directory is under a correct directory structure to use Go 1.5 vendoring;
example of cloning and preparing the correct environment `GOPATH`: example of cloning and preparing the correct environment `GOPATH`:

View File

@ -1,4 +1,4 @@
FROM golang:1.5.1 FROM golang:1.5.2
RUN go get github.com/golang/lint/golint \ RUN go get github.com/golang/lint/golint \
github.com/mattn/goveralls \ github.com/mattn/goveralls \

2
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{ {
"ImportPath": "github.com/docker/machine", "ImportPath": "github.com/docker/machine",
"GoVersion": "go1.5.1", "GoVersion": "go1.5.2",
"Packages": [ "Packages": [
"github.com/docker/machine", "github.com/docker/machine",
"github.com/docker/machine/cmd", "github.com/docker/machine/cmd",

View File

@ -8,7 +8,7 @@ machine:
# - sudo apt-get install -y virtualbox # - sudo apt-get install -y virtualbox
post: post:
- gvm install go1.5.1 -B --name=stable - gvm install go1.5.2 -B --name=stable
environment: environment:
# Convenient shortcuts to "common" locations # Convenient shortcuts to "common" locations