Merge branch 'k8s-1.10'

pusher · Jul 2, 2018 · 8829160 · 8829160
2 parents e8e0cec + 0c78d86
commit 8829160
Show file tree

Hide file tree

Showing 8 changed files with 1,054 additions and 1,185 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 FROM golang:1.10 AS builder
 WORKDIR /go/src/github.com/pusher/k8s-spot-rescheduler
 COPY . .
-RUN curl -s https://glide.sh/get | sh \
-    && glide install -v \
+RUN go get -u github.com/golang/dep/cmd/dep \
+    && dep ensure -v \
     && env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o rescheduler
 
 FROM scratch