diff --git a/Dockerfile b/Dockerfile
index 257bdcd86..07e13620f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,20 @@ VOLUME /data
 
 RUN echo 'data-dir = "/data"' > /config
 
+RUN git clone --depth 1 https://github.com/Masterminds/glide.git /go/src/github.com/Masterminds/glide \
+    && cd /go/src/github.com/Masterminds/glide \
+    && git fetch --tags --depth 1 \
+    && git checkout tags/v0.12.3 -b build \
+    && make build \
+    && mv ./glide /go/bin \
+    && cd / \
+    && rm -r /go/src/github.com/Masterminds/glide
+
 COPY . /go/src/github.com/pilosa/pilosa
-RUN CGO_ENABLED=0 go install -a github.com/pilosa/pilosa/cmd/pilosa
+
+RUN cd /go/src/github.com/pilosa/pilosa \
+    && make vendor \
+    && CGO_ENABLED=0 go install -a github.com/pilosa/pilosa/cmd/pilosa
 
 ENTRYPOINT ["/go/bin/pilosa"]
 CMD ["-config", "/config"]
diff --git a/Makefile b/Makefile
index 09b5616be..f55fb8445 100644
--- a/Makefile
+++ b/Makefile
@@ -43,5 +43,5 @@ install: vendor
 	go install $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosa
 	go install $(LDFLAGS) $(FLAGS) $(CLONE_URL)/cmd/pilosactl
 
-docker: vendor
+docker:
 	docker build -t pilosa:latest .