From 6362b1da7fc76e1131d3b5850601d1236d21d5a6 Mon Sep 17 00:00:00 2001 From: emile Date: Tue, 13 Oct 2015 20:19:34 +0200 Subject: [PATCH] Update package management with Glide --- .gitignore | 3 +- Godeps/Godeps.json | 302 ------------------ Godeps/Readme | 5 - Godeps/_workspace/.gitignore | 3 - build.Dockerfile | 17 +- glide.yaml | 147 +++++++++ script/binary | 3 +- script/crossbinary | 3 +- script/test-integration | 2 +- script/test-unit | 4 +- script/validate-gofmt | 2 +- script/validate-govet | 2 +- .../autogen/dockerversion/dockerversion.go | 0 13 files changed, 161 insertions(+), 332 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/Readme delete mode 100644 Godeps/_workspace/.gitignore create mode 100644 glide.yaml rename {Godeps/_workspace/src => vendor}/github.com/docker/docker/autogen/dockerversion/dockerversion.go (100%) diff --git a/.gitignore b/.gitignore index 77a760ab5..a025dda63 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ log traefik traefik.toml -Godeps/_workspace/bin -Godeps/_workspace/pkg +vendor/ diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 248f5b5e3..000000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,302 +0,0 @@ -{ - "ImportPath": "github.com/emilevauge/traefik", - "GoVersion": "go1.4.2", - "Packages": [ - "./..." - ], - "Deps": [{ - "ImportPath": "github.com/BurntSushi/toml", - "Rev": "bd2bdf7f18f849530ef7a1c29a4290217cab32a1" - }, { - "ImportPath": "github.com/BurntSushi/ty", - "Rev": "6add9cd6ad42d389d6ead1dde60b4ad71e46fd74" - }, { - "ImportPath": "github.com/Sirupsen/logrus", - "Comment": "v0.8.7", - "Rev": "418b41d23a1bf978c06faea5313ba194650ac088" - }, { - "ImportPath": "github.com/alecthomas/template", - "Rev": "b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0" - }, { - "ImportPath": "github.com/alecthomas/units", - "Rev": "6b4e7dc5e3143b85ea77909c72caf89416fc2915" - }, { - "ImportPath": "github.com/boltdb/bolt", - "Rev": "51f99c862475898df9773747d3accd05a7ca33c1" - }, { - "ImportPath": "github.com/cenkalti/backoff", - "Rev": "4dc77674aceaabba2c7e3da25d4c823edfb73f99" - }, { - "ImportPath": "github.com/codahale/hdrhistogram", - "Rev": "954f16e8b9ef0e5d5189456aa4c1202758e04f17" - }, { - "ImportPath": "github.com/codegangsta/negroni", - "Comment": "v0.1-70-gc7477ad", - "Rev": "c7477ad8e330bef55bf1ebe300cf8aa67c492d1b" - }, { - "ImportPath": "github.com/coreos/go-etcd/etcd", - "Comment": "v2.0.0-11-gcc90c7b", - "Rev": "cc90c7b091275e606ad0ca7102a23fb2072f3f5e" - }, { - "ImportPath": "github.com/davecgh/go-spew/spew", - "Rev": "2df174808ee097f90d259e432cc04442cf60be21" - }, { - "ImportPath": "github.com/docker/libkv", - "Rev": "3732f7ff1b56057c3158f10bceb1e79133025373" - }, { - "ImportPath": "github.com/docker/distribution", - "Comment": "v2.0.0-467-g9038e48", - "Rev": "9038e48c3b982f8e82281ea486f078a73731ac4e" - }, { - "ImportPath": "github.com/docker/docker/api", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/cliconfig", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/daemon/network", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/graph/tags", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/image", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/opts", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/archive", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/fileutils", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/homedir", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/httputils", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/ioutils", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/jsonmessage", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/mflag", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/nat", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/parsers", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/pools", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/promise", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/random", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/stdcopy", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/stringid", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/symlink", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/system", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/tarsum", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/term", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/timeutils", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/tlsconfig", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/ulimit", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/units", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/urlutil", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/useragent", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/pkg/version", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/registry", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/runconfig", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/utils", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/docker/volume", - "Comment": "v1.4.1-5200-gf39987a", - "Rev": "f39987afe8d611407887b3094c03d6ba6a766a67" - }, { - "ImportPath": "github.com/docker/libcompose/docker", - "Rev": "79ef5d150f053a5b12f16b02d8844ed7cf33611a" - }, { - "ImportPath": "github.com/docker/libcompose/logger", - "Rev": "79ef5d150f053a5b12f16b02d8844ed7cf33611a" - }, { - "ImportPath": "github.com/docker/libcompose/lookup", - "Rev": "79ef5d150f053a5b12f16b02d8844ed7cf33611a" - }, { - "ImportPath": "github.com/docker/libcompose/project", - "Rev": "79ef5d150f053a5b12f16b02d8844ed7cf33611a" - }, { - "ImportPath": "github.com/docker/libcompose/utils", - "Rev": "79ef5d150f053a5b12f16b02d8844ed7cf33611a" - }, { - "ImportPath": "github.com/docker/libtrust", - "Rev": "9cbd2a1374f46905c68a4eb3694a130610adc62a" - }, { - "ImportPath": "github.com/elazarl/go-bindata-assetfs", - "Rev": "d5cac425555ca5cf00694df246e04f05e6a55150" - }, { - "ImportPath": "github.com/flynn/go-shlex", - "Rev": "3f9db97f856818214da2e1057f8ad84803971cff" - }, { - "ImportPath": "github.com/fsouza/go-dockerclient", - "Rev": "0239034d42f665efa17fd77c39f891c2f9f32922" - }, { - "ImportPath": "github.com/gambol99/go-marathon", - "Rev": "0ba31bcb0d7633ba1888d744c42990eb15281cf1" - }, { - "ImportPath": "github.com/gorilla/context", - "Rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd" - }, { - "ImportPath": "github.com/gorilla/handlers", - "Rev": "40694b40f4a928c062f56849989d3e9cd0570e5f" - }, { - "ImportPath": "github.com/gorilla/mux", - "Rev": "f15e0c49460fd49eebe2bcc8486b05d1bef68d3a" - }, { - "ImportPath": "github.com/hashicorp/consul/api", - "Comment": "v0.5.2-313-gde08067", - "Rev": "de080672fee9e6104572eeea89eccdca135bb918" - }, { - "ImportPath": "github.com/mailgun/log", - "Rev": "44874009257d4d47ba9806f1b7f72a32a015e4d8" - }, { - "ImportPath": "github.com/mailgun/manners", - "Comment": "0.3.1-30-g37136f7", - "Rev": "37136f736785d7c6aa3b9a27b4b2dd1028ca6d79" - }, { - "ImportPath": "github.com/mailgun/oxy/cbreaker", - "Rev": "547c334d658398c05b346c0b79d8f47ba2e1473b" - }, { - "ImportPath": "github.com/mailgun/oxy/forward", - "Rev": "547c334d658398c05b346c0b79d8f47ba2e1473b" - }, { - "ImportPath": "github.com/mailgun/oxy/memmetrics", - "Rev": "547c334d658398c05b346c0b79d8f47ba2e1473b" - }, { - "ImportPath": "github.com/mailgun/oxy/roundrobin", - "Rev": "547c334d658398c05b346c0b79d8f47ba2e1473b" - }, { - "ImportPath": "github.com/mailgun/oxy/utils", - "Rev": "547c334d658398c05b346c0b79d8f47ba2e1473b" - }, { - "ImportPath": "github.com/mailgun/predicate", - "Rev": "cb0bff91a7ab7cf7571e661ff883fc997bc554a3" - }, { - "ImportPath": "github.com/mailgun/timetools", - "Rev": "fd192d755b00c968d312d23f521eb0cdc6f66bd0" - }, { - "ImportPath": "github.com/samuel/go-zookeeper/zk", - "Rev": "fa6674abf3f4580b946a01bf7a1ce4ba8766205b" - }, { - "ImportPath": "github.com/opencontainers/runc/libcontainer/user", - "Comment": "v0.0.4-21-g4ab1324", - "Rev": "4ab132458fc3e9dbeea624153e0331952dc4c8d5" - }, { - "ImportPath": "github.com/samalba/dockerclient", - "Rev": "cfb489c624b635251a93e74e1e90eb0959c5367f" - }, { - "ImportPath": "github.com/thoas/stats", - "Rev": "54ed61c2b47e263ae2f01b86837b0c4bd1da28e8" - }, { - "ImportPath": "github.com/unrolled/render", - "Rev": "26b4e3aac686940fe29521545afad9966ddfc80c" - }, { - "ImportPath": "github.com/vdemeester/shakers", - "Rev": "8fe734f75f3a70b651cbfbf8a55a009da09e8dc5" - }, { - "ImportPath": "golang.org/x/net/context", - "Rev": "d9558e5c97f85372afee28cf2b6059d7d3818919" - }, { - "ImportPath": "gopkg.in/alecthomas/kingpin.v2", - "Comment": "v2.0.12", - "Rev": "639879d6110b1b0409410c7b737ef0bb18325038" - }, { - "ImportPath": "gopkg.in/check.v1", - "Rev": "11d3bc7aa68e238947792f30573146a3231fc0f1" - }, { - "ImportPath": "gopkg.in/fsnotify.v1", - "Comment": "v1.2.0", - "Rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0" - }, { - "ImportPath": "gopkg.in/mgo.v2/bson", - "Comment": "r2015.06.03-5-g22287ba", - "Rev": "22287bab4379e1fbf6002fb4eb769888f3fb224c" - }, { - "ImportPath": "gopkg.in/yaml.v2", - "Rev": "7ad95dd0798a40da1ccdff6dff35fd177b5edf40" - }] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d5..000000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index e6b58bb02..000000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/pkg -/bin -/src \ No newline at end of file diff --git a/build.Dockerfile b/build.Dockerfile index d161c5f18..3a23c6137 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -1,12 +1,15 @@ FROM golang:1.5 -RUN go get github.com/tools/godep +RUN go get github.com/Masterminds/glide RUN go get github.com/mitchellh/gox RUN go get github.com/tcnksm/ghr # Which docker version to test on ENV DOCKER_VERSION 1.6.2 +# enable GO15VENDOREXPERIMENT +ENV GO15VENDOREXPERIMENT 1 + # Download docker RUN set -ex; \ curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} -o /usr/local/bin/docker-${DOCKER_VERSION}; \ @@ -15,17 +18,9 @@ RUN set -ex; \ # Set the default Docker to be run RUN ln -s /usr/local/bin/docker-${DOCKER_VERSION} /usr/local/bin/docker -ENV PATH /go/src/github.com/emilevauge/traefik/Godeps/_workspace/bin:$PATH - WORKDIR /go/src/github.com/emilevauge/traefik -# This is a hack (see libcompose#32) - will be removed when libcompose will be fixed -# (i.e go get able) -RUN mkdir -p /go/src/github.com/docker/docker/autogen/dockerversion/ -COPY Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go /go/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go - -RUN mkdir Godeps -COPY Godeps/Godeps.json Godeps/ -RUN godep restore +COPY glide.yaml glide.yaml +RUN glide up COPY . /go/src/github.com/emilevauge/traefik diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 000000000..0ed2272ae --- /dev/null +++ b/glide.yaml @@ -0,0 +1,147 @@ +package: main +import: + - package: github.com/mailgun/timetools + ref: fd192d755b00c968d312d23f521eb0cdc6f66bd0 + - package: github.com/coreos/go-etcd + ref: cc90c7b091275e606ad0ca7102a23fb2072f3f5e + subpackages: + - etcd + - package: github.com/davecgh/go-spew + ref: 2df174808ee097f90d259e432cc04442cf60be21 + subpackages: + - spew + - package: gopkg.in/fsnotify.v1 + ref: 96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0 + - package: github.com/BurntSushi/ty + ref: 6add9cd6ad42d389d6ead1dde60b4ad71e46fd74 + - package: github.com/hashicorp/consul + ref: de080672fee9e6104572eeea89eccdca135bb918 + subpackages: + - api + - package: github.com/alecthomas/template + ref: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0 + - package: github.com/thoas/stats + ref: 54ed61c2b47e263ae2f01b86837b0c4bd1da28e8 + - package: github.com/vdemeester/shakers + ref: 8fe734f75f3a70b651cbfbf8a55a009da09e8dc5 + - package: github.com/samuel/go-zookeeper + ref: fa6674abf3f4580b946a01bf7a1ce4ba8766205b + subpackages: + - zk + - package: github.com/alecthomas/units + ref: 6b4e7dc5e3143b85ea77909c72caf89416fc2915 + - package: github.com/unrolled/render + ref: 26b4e3aac686940fe29521545afad9966ddfc80c + - package: github.com/flynn/go-shlex + ref: 3f9db97f856818214da2e1057f8ad84803971cff + - package: github.com/fsouza/go-dockerclient + ref: 0239034d42f665efa17fd77c39f891c2f9f32922 + - package: github.com/codegangsta/negroni + ref: c7477ad8e330bef55bf1ebe300cf8aa67c492d1b + - package: gopkg.in/yaml.v2 + ref: 7ad95dd0798a40da1ccdff6dff35fd177b5edf40 + - package: github.com/opencontainers/runc + ref: 4ab132458fc3e9dbeea624153e0331952dc4c8d5 + subpackages: + - libcontainer/user + - package: github.com/boltdb/bolt + ref: 51f99c862475898df9773747d3accd05a7ca33c1 + - package: github.com/docker/libtrust + ref: 9cbd2a1374f46905c68a4eb3694a130610adc62a + - package: github.com/elazarl/go-bindata-assetfs + ref: d5cac425555ca5cf00694df246e04f05e6a55150 + - package: github.com/docker/distribution + ref: 9038e48c3b982f8e82281ea486f078a73731ac4e + - package: github.com/BurntSushi/toml + ref: bd2bdf7f18f849530ef7a1c29a4290217cab32a1 + - package: github.com/samalba/dockerclient + ref: cfb489c624b635251a93e74e1e90eb0959c5367f + - package: gopkg.in/check.v1 + ref: 11d3bc7aa68e238947792f30573146a3231fc0f1 + - package: gopkg.in/alecthomas/kingpin.v2 + ref: 639879d6110b1b0409410c7b737ef0bb18325038 + - package: github.com/Sirupsen/logrus + ref: 418b41d23a1bf978c06faea5313ba194650ac088 + - package: golang.org/x/net + ref: d9558e5c97f85372afee28cf2b6059d7d3818919 + subpackages: + - context + - package: gopkg.in/mgo.v2 + ref: 22287bab4379e1fbf6002fb4eb769888f3fb224c + subpackages: + - bson + - package: github.com/gambol99/go-marathon + ref: 0ba31bcb0d7633ba1888d744c42990eb15281cf1 + - package: github.com/mailgun/manners + ref: 37136f736785d7c6aa3b9a27b4b2dd1028ca6d79 + - package: github.com/gorilla/handlers + ref: 40694b40f4a928c062f56849989d3e9cd0570e5f + - package: github.com/mailgun/log + ref: 44874009257d4d47ba9806f1b7f72a32a015e4d8 + - package: github.com/mailgun/oxy + ref: 547c334d658398c05b346c0b79d8f47ba2e1473b + subpackages: + - cbreaker + - forward + - memmetrics + - roundrobin + - utils + - package: github.com/docker/docker + ref: f39987afe8d611407887b3094c03d6ba6a766a67 + subpackages: + - autogen + - api + - cliconfig + - daemon/network + - graph/tags + - image + - opts + - pkg/archive + - pkg/fileutils + - pkg/homedir + - pkg/httputils + - pkg/ioutils + - pkg/jsonmessage + - pkg/mflag + - pkg/nat + - pkg/parsers + - pkg/pools + - pkg/promise + - pkg/random + - pkg/stdcopy + - pkg/stringid + - pkg/symlink + - pkg/system + - pkg/tarsum + - pkg/term + - pkg/timeutils + - pkg/tlsconfig + - pkg/ulimit + - pkg/units + - pkg/urlutil + - pkg/useragent + - pkg/version + - registry + - runconfig + - utils + - volume + - package: github.com/docker/libcompose + ref: 79ef5d150f053a5b12f16b02d8844ed7cf33611a + subpackages: + - docker + - logger + - lookup + - project + - utils + - package: github.com/cenkalti/backoff + ref: 4dc77674aceaabba2c7e3da25d4c823edfb73f99 + - package: github.com/gorilla/context + ref: 215affda49addc4c8ef7e2534915df2c8c35c6cd + - package: github.com/docker/libkv + ref: 3732f7ff1b56057c3158f10bceb1e79133025373 + - package: github.com/codahale/hdrhistogram + ref: 954f16e8b9ef0e5d5189456aa4c1202758e04f17 + - package: github.com/mailgun/predicate + ref: cb0bff91a7ab7cf7571e661ff883fc997bc554a3 + - package: github.com/gorilla/mux + ref: f15e0c49460fd49eebe2bcc8486b05d1bef68d3a diff --git a/script/binary b/script/binary index 89d2dacf4..db71ece96 100755 --- a/script/binary +++ b/script/binary @@ -7,8 +7,7 @@ if ! test -e gen.go; then fi rm -f dist/traefik -rm -rf Godeps/_workspace/pkg # Build binaries -CGO_ENABLED=0 godep go build -a -installsuffix nocgo -o dist/traefik . +CGO_ENABLED=0 go build -a -installsuffix nocgo -o dist/traefik . diff --git a/script/crossbinary b/script/crossbinary index 5c82b1fd8..7099fb23f 100755 --- a/script/crossbinary +++ b/script/crossbinary @@ -22,9 +22,8 @@ fi # Get rid of existing binaries rm -f dist/traefik_* -rm -rf Godeps/_workspace/pkg # Build binaries -GOPATH=`godep path`:$GOPATH gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \ +gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \ -output="dist/traefik_{{.OS}}-{{.Arch}}" diff --git a/script/test-integration b/script/test-integration index 87a643808..63f4b46f5 100755 --- a/script/test-integration +++ b/script/test-integration @@ -6,5 +6,5 @@ export DEST=. TESTFLAGS="$TESTFLAGS -test.timeout=30m -check.v" cd integration -GOPATH=`godep path`:$GOPATH go test $TESTFLAGS +go test $TESTFLAGS diff --git a/script/test-unit b/script/test-unit index 6d1d3b350..c27e5c825 100755 --- a/script/test-unit +++ b/script/test-unit @@ -17,7 +17,7 @@ find_dirs() { find . -not \( \ \( \ -path './integration/*' \ - -o -path './Godeps/*' \ + -o -path './vendor/*' \ -o -path './.git/*' \ \) \ -prune \ @@ -34,7 +34,7 @@ TESTS_FAILED=() for dir in $TESTDIRS; do echo '+ go test' $TESTFLAGS "${dir}" - godep go test ${TESTFLAGS} ${dir} + go test ${TESTFLAGS} ${dir} if [ $? != 0 ]; then TESTS_FAILED+=("$dir") echo diff --git a/script/validate-gofmt b/script/validate-gofmt index 3051960e5..70d136c3f 100755 --- a/script/validate-gofmt +++ b/script/validate-gofmt @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^Godeps' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor' || true) ) unset IFS badFiles=() diff --git a/script/validate-govet b/script/validate-govet index df21d3f09..873221d99 100755 --- a/script/validate-govet +++ b/script/validate-govet @@ -3,7 +3,7 @@ source "$(dirname "$BASH_SOURCE")/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^Godeps/' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) ) unset IFS errors=() diff --git a/Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go b/vendor/github.com/docker/docker/autogen/dockerversion/dockerversion.go similarity index 100% rename from Godeps/_workspace/src/github.com/docker/docker/autogen/dockerversion/dockerversion.go rename to vendor/github.com/docker/docker/autogen/dockerversion/dockerversion.go