docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX #3051 Use golang 1.6 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2016-02-13 01:19:13 +01:00
parent 87a659efb3
commit 27e572113f
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@ -19,7 +19,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.3 development environment 1. A running instance of Docker or a Golang 1.6 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/)
@ -32,8 +32,8 @@ To build the `docker-machine` binary using containers, simply run:
## Local Go 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;
example of cloning and preparing the correct environment `GOPATH`: Example of cloning and preparing the correct environment `GOPATH`:
mkdir docker-machine mkdir docker-machine
cd docker-machine cd docker-machine

8
Dockerfile
View File

@ -1,13 +1,11 @@
FROM golang:1.5.3 FROM golang:1.6
RUN go get github.com/golang/lint/golint \ RUN go get github.com/golang/lint/golint \
github.com/mattn/goveralls \ github.com/mattn/goveralls \
golang.org/x/tools/cover \ golang.org/x/tools/cover
github.com/tools/godep \
github.com/aktau/github-release
ENV USER root ENV USER root
WORKDIR /go/src/github.com/docker/machine WORKDIR /go/src/github.com/docker/machine
COPY . /go/src/github.com/docker/machine COPY . ./
RUN mkdir bin RUN mkdir bin

9
appveyor.yml
View File

@ -6,16 +6,15 @@ os: Windows Server 2012 R2
environment: environment:
GOPATH: c:\gopath GOPATH: c:\gopath
GO15VENDOREXPERIMENT: 1 GOVERSION: 1.6
GOARCH: amd64
GOVERSION: 1.5.3
clone_folder: c:\gopath\src\github.com\docker\machine clone_folder: c:\gopath\src\github.com\docker\machine
install: install:
- appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.zip
- ps: rmdir C:\go -Force -Recurse -Confirm:$false
- 7z x go%GOVERSION%.windows-amd64.zip -o"C:\" -y > nul
- set Path=c:\go\bin;%Path% - set Path=c:\go\bin;%Path%
- appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-%GOARCH%.msi
- msiexec /i go%GOVERSION%.windows-%GOARCH%.msi /q
build_script: build_script:
- go build -i -o ./bin/docker-machine.exe ./cmd/machine.go - go build -i -o ./bin/docker-machine.exe ./cmd/machine.go

2
circle.yml
View File

@ -3,7 +3,7 @@ machine:
- bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/1.0.22/binscripts/gvm-installer) - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/1.0.22/binscripts/gvm-installer)
post: post:
- gvm install go1.5.3 -B --name=stable - gvm install go1.6 -B --name=stable
environment: environment:
CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME

3
mk/main.mk
View File

@ -5,9 +5,6 @@ GO_GCFLAGS :=
# Full package list # Full package list
PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/cmd") PKGS := $(shell go list -tags "$(BUILDTAGS)" ./... | grep -v "/vendor/" | grep -v "/cmd")
# Support go1.5 vendoring (let us avoid messing with GOPATH or using godep)
export GO15VENDOREXPERIMENT = 1
# Resolving binary dependencies for specific targets # Resolving binary dependencies for specific targets
GOLINT_BIN := $(GOPATH)/bin/golint GOLINT_BIN := $(GOPATH)/bin/golint
GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '') GOLINT := $(shell [ -x $(GOLINT_BIN) ] && echo $(GOLINT_BIN) || echo '')