From ae73d08d674b2403639758500f271e091da9dfe3 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sun, 1 Nov 2015 23:00:21 +0100 Subject: [PATCH] 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 --- README.md | 1 + build.Dockerfile | 1 + generate.go | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 84600bf31..8704f7004 100644 --- 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` diff --git a/build.Dockerfile b/build.Dockerfile index 3a23c6137..eddcac4f8 100644 --- 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 diff --git a/generate.go b/generate.go index 140d6b706..874b4474b 100644 --- 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/...