Merge pull request #84 from vdemeester/ignore-me

Add .dockerignore to lightweight build context

.dockerignore

@@ -0,0 +1,3 @@
+dist/
+vendor/
+!dist/traefik

Makefile

@@ -20,6 +20,9 @@ print-%: ; @echo $*=$($*)
 
 default: binary
 
+all: build
+	$(DOCKER_RUN_TRAEFIK) ./script/make.sh
+
 binary: build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate binary
 

generate.go

@@ -6,4 +6,7 @@ Copyright
 //go:generate rm -vf gen.go
 //go:generate go-bindata -o gen.go static/... templates/...
 
+//go:generate mkdir -p vendor/github.com/docker/docker/autogen/dockerversion
+//go:generate cp script/dockerversion vendor/github.com/docker/docker/autogen/dockerversion/dockerversion.go
+
 package main

middlewares/websocketproxy.go

@@ -101,6 +101,9 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	for _, cookie := range req.Header[http.CanonicalHeaderKey("Cookie")] {
 		requestHeader.Add("Cookie", cookie)
 	}
+	for _, auth := range req.Header[http.CanonicalHeaderKey("Authorization")] {
+		requestHeader.Add("Authorization", auth)
+	}
 
 	// Pass X-Forwarded-For headers too, code below is a part of
 	// httputil.ReverseProxy. See http://en.wikipedia.org/wiki/X-Forwarded-For
@@ -124,13 +127,16 @@ func (w *WebsocketProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 		requestHeader.Set("X-Forwarded-Proto", "https")
 	}
 
+	//frontend Origin != backend Origin
+	requestHeader.Del("Origin")
+
 	// Connect to the backend URL, also pass the headers we get from the requst
 	// together with the Forwarded headers we prepared above.
 	// TODO: support multiplexing on the same backend connection instead of
 	// opening a new TCP connection time for each request. This should be
 	// optional:
 	// http://tools.ietf.org/html/draft-ietf-hybi-websocket-multiplexing-01
-	connBackend, resp, err := dialer.Dial(backendURL.String(), nil)
+	connBackend, resp, err := dialer.Dial(backendURL.String(), requestHeader)
 	if err != nil {
 		log.Errorf("Websocketproxy: couldn't dial to remote backend url %s, %s, %+v", backendURL.String(), err, resp)
 		http.Error(rw, "Remote backend unreachable", http.StatusBadGateway)

script/dockerversion

@@ -0,0 +1,12 @@
+// AUTOGENERATED FILE; see /go/src/github.com/docker/docker/hack/make/.go-autogen
+package dockerversion
+
+var (
+	GITCOMMIT string = "traefik-import"
+	VERSION   string = "traefik-import"
+	BUILDTIME string = "traefik-import"
+
+	IAMSTATIC string = "traefik-import"
+	INITSHA1  string = "traefik-import"
+	INITPATH  string = "traefik-import"
+)

script/make.sh

@@ -5,6 +5,7 @@ set -e
 DEFAULT_BUNDLES=(
 	validate-gofmt
 	validate-govet
+	generate
 	binary
 
 	test-unit

vendor/github.com/docker/docker/autogen/dockerversion/dockerversion.go

@@ -1,12 +0,0 @@
-// AUTOGENERATED FILE; see ./hack/make/.go-autogen
-package dockerversion
-
-var (
-	GITCOMMIT string = ""
-	VERSION   string = ""
-	BUILDTIME string = ""
-
-	IAMSTATIC string = "true"
-	INITSHA1  string = ""
-	INITPATH  string = ""
-)