kubernetes
diff --git a/‎images/404-server/.gitignore
+1 b/‎images/404-server/.gitignore
+1
diff --git a/‎images/404-server/Godeps/Godeps.json
+17-14 b/‎images/404-server/Godeps/Godeps.json
+17-14
diff --git a/‎images/404-server/Makefile
+2-8 b/‎images/404-server/Makefile
+2-8
diff --git a/‎images/404-server/vendor/github.com/beorn7/perks/quantile/stream.go
+1-1 b/‎images/404-server/vendor/github.com/beorn7/perks/quantile/stream.go
+1-1
diff --git a/‎images/404-server/vendor/github.com/golang/protobuf/proto/decode.go
+104-8 b/‎images/404-server/vendor/github.com/golang/protobuf/proto/decode.go
+104-8
diff --git a/‎images/404-server/vendor/github.com/golang/protobuf/proto/text_parser.go
+5-1 b/‎images/404-server/vendor/github.com/golang/protobuf/proto/text_parser.go
+5-1
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
+2-2 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/LICENSE
+2-2
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/NOTICE
-1 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/NOTICE
-1
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore
-1 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/.gitignore
-1
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/Makefile
-7 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/Makefile
-7
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
+1-1 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/decode.go
+1-1
diff --git a/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
+2-2 b/‎images/404-server/vendor/github.com/matttproud/golang_protobuf_extensions/pbutil/encode.go
+2-2
diff --git a/‎images/404-server/vendor/github.com/prometheus/client_golang/AUTHORS.md
-18 b/‎images/404-server/vendor/github.com/prometheus/client_golang/AUTHORS.md
-18
diff --git a/‎images/404-server/vendor/github.com/prometheus/client_golang/prometheus/counter.go
+2-10 b/‎images/404-server/vendor/github.com/prometheus/client_golang/prometheus/counter.go
+2-10
diff --git a/‎images/404-server/vendor/github.com/prometheus/client_golang/prometheus/desc.go
+3-8 b/‎images/404-server/vendor/github.com/prometheus/client_golang/prometheus/desc.go
+3-8
@@ -0,0 +1 @@
+server
@@ -20,20 +20,14 @@
 
 all: push
 
-TAG=1.3
+TAG=1.4
 PREFIX?=gcr.io/google_containers/defaultbackend
 ARCH?=amd64
-GOLANG_VERSION=1.7
-TEMP_DIR:=$(shell mktemp -d)
 
 server: server.go
 	CGO_ENABLED=0 GOOS=linux GOARCH=$(ARCH) GOARM=6 go build -a -installsuffix cgo -ldflags '-w -s' -o server
 
-container:
-	# Compile the binary inside a container for reliable builds
-	docker pull golang:$(GOLANG_VERSION)
-	docker run --rm -it -v $(PWD)/vendor:/go/src -v $(PWD):/build golang:$(GOLANG_VERSION) /bin/bash -c "make -C /build server ARCH=$(ARCH)"
-
+container: server
 	docker build --pull -t $(PREFIX)-$(ARCH):$(TAG) .
 
 push: container