Merge PR https://github.com/EmileVauge/traefik/pull/3

2015-09-22 11:29:41 +02:00 · 2015-09-22 11:29:41 +02:00 · 8825a26ae6
commit 8825a26ae6
parent 967e033b7e
593 changed files with 88072 additions and 28 deletions
--- a/script/binary
+++ b/script/binary
@ -22,9 +22,10 @@ fi

 # Get rid of existing binaries
 rm -f dist/traefik*
+rm -rf Godeps/_workspace/pkg

 # Build binaries
-CGO_ENABLED=0 go build -a -installsuffix nocgo .
-gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \
+CGO_ENABLED=0 godep go build -a -installsuffix nocgo -o dist/traefik .
+GOPATH=`godep path`:$GOPATH gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \
    -output="dist/traefik_{{.OS}}-{{.Arch}}"