diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..5657f6ea7
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+vendor
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5b032e67c..609313619 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,12 @@
 # appclerator/protoc is based on alpine and includes latest go and protoc
 FROM appcelerator/protoc
-RUN apk --no-cache add make bash git docker
-COPY . /go/src/github.com/appcelerator/amp
+RUN apk --no-cache add make bash git docker curl
 WORKDIR /go/src/github.com/appcelerator/amp
+COPY glide.lock /go/src/github.com/appcelerator/amp/
+COPY glide.yaml /go/src/github.com/appcelerator/amp/
+RUN curl https://glide.sh/get | sh
+RUN glide install
+COPY . /go/src/github.com/appcelerator/amp
 RUN make install-host
 EXPOSE 50051
 ENTRYPOINT [ "amplifier" ]
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 000000000..3ca8e7a70
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,12 @@
+version: "2"
+
+services:
+  sut:
+    image: appcelerator/sut
+    build: .
+    entrypoint: make
+    command: test
+    environment:
+      ES_URL: http://elasticsearch:9200
+  elasticsearch:
+    image: appcelerator/elasticsearch-amp:latest