Merge pull request #91 from vdemeester/go-bindata-out-of-generation

Remove go get go-bindata from generate.go
2015-11-02 16:36:20 +01:00 · 2015-11-02 13:56:55 +01:00
3 changed files with 2 additions and 1 deletions
--- a/README.md
+++ b/README.md
@@ -85,6 +85,7 @@ You need either [Docker](https://github.com/docker/docker) and `make`, or `go` a
 #### Setting up your `go` environment
 - You need `go` v1.5
 - You need to set `export GO15VENDOREXPERIMENT=1` environment variable
+- You need `go-bindata` to be able to use `go generate` command (needed to build) : `go get github.com/jteeuwen/go-bindata/...`.
 - If you clone Træfɪk into something like `~/go/src/github.com/traefik`, your `GOPATH` variable will have to be set to `~/go`: export `GOPATH=~/go`.

 #### Using `Docker` and `Makefile`
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -3,6 +3,7 @@ FROM golang:1.5
 RUN go get github.com/Masterminds/glide
 RUN go get github.com/mitchellh/gox
 RUN go get github.com/tcnksm/ghr
+RUN go get github.com/jteeuwen/go-bindata/...

 # Which docker version to test on
 ENV DOCKER_VERSION 1.6.2
--- a/generate.go
+++ b/generate.go
@@ -2,7 +2,6 @@
 Copyright
 */

-//go:generate go get github.com/jteeuwen/go-bindata/...
 //go:generate rm -vf gen.go
 //go:generate go-bindata -o gen.go static/... templates/...
Author	SHA1	Message	Date
Emile Vauge	6e1a0554c0	Merge pull request #91 from vdemeester/go-bindata-out-of-generation Remove go get go-bindata from generate.go	2015-11-02 16:36:20 +01:00
Vincent Demeester	ae73d08d67	Remove go get go-bindata from generate.go This mades the build impossible offline (as when doing a go generate it was trying to go get something) Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2015-11-02 13:56:55 +01:00