diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..463ec243
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '2'
+
+services:
+    proxy:
+        build: ./proxy/
+        links:
+            - webagg:webagg
+
+        environment:
+            - "WEBAGG=http://webrecplatform_webagg_1:8080"
+
+        ports:
+            - 9080:9080
+
+        volumes:
+            - ${HOME}/.mitmproxy/:/root/.mitmproxy/
+
+    webagg:
+        build: ./webagg/
diff --git a/webagg/Dockerfile b/webagg/Dockerfile
new file mode 100644
index 00000000..9dc3c623
--- /dev/null
+++ b/webagg/Dockerfile
@@ -0,0 +1,14 @@
+FROM python:3.5
+
+WORKDIR /code/
+
+RUN pip install -U git+https://github.com/ikreymer/pywb.git@develop#egg=pywb-0.30.0-develop
+RUN pip install uwsgi gevent bottle
+
+ADD . /code/webagg/
+ADD ./test/ /code/test/
+
+WORKDIR /code/
+CMD uwsgi /code/test/live.ini
+
+