diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..7b202f3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:14.04
+MAINTAINER jono@opennetworking.org
+
+RUN apt-get update && \
+    apt-get install -qy --no-install-recommends telnet build-essential gawk wget texinfo supervisor iptables libreadline-gplv2-dev pkg-config libc-ares-dev autoconf automake libtool
+
+RUN mkdir /quagga
+COPY . /quagga/
+WORKDIR /quagga
+RUN autoreconf -f -i && \
+    ./configure --enable-fpm --prefix=/usr && \
+    make && \
+    make install
+
+EXPOSE 179 2601 2605
+
+WORKDIR /
+ADD docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+ENTRYPOINT ["/usr/bin/supervisord"]
+
diff --git a/docker/bgpd.conf b/docker/bgpd.conf
new file mode 100644
index 0000000..6c449a0
--- /dev/null
+++ b/docker/bgpd.conf
@@ -0,0 +1,18 @@
+! -*- bgp -*-
+!
+! BGPd sample configuration file
+!
+!
+hostname quagga-test
+password zebra
+!
+router bgp 65100
+  bgp router-id 172.18.0.1
+  timers bgp 3 9
+  neighbor 172.18.0.254 remote-as 65101
+  neighbor 172.18.0.254 ebgp-multihop
+  neighbor 172.18.0.254 timers connect 5
+  neighbor 172.18.0.254 advertisement-interval 5
+  neighbor 172.18.0.254 default-originate
+!
+log file /var/log/quagga/bgpd.log
diff --git a/docker/run.sh b/docker/run.sh
new file mode 100644
index 0000000..39653b4
--- /dev/null
+++ b/docker/run.sh
@@ -0,0 +1,7 @@
+
+#!/bin/bash
+
+# Example command to run the container with quagga-fpm image
+# Replace VOLUME with the path where your docker configs are
+VOLUME=~/docker-quagga/volumes/quagga
+sudo docker run --privileged -d -v $VOLUME:/etc/quagga --name quagga quagga-fpm
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
new file mode 100644
index 0000000..00397f8
--- /dev/null
+++ b/docker/supervisord.conf
@@ -0,0 +1,7 @@
+[supervisord]
+nodaemon=true
+
+[program:zebra]
+command=/usr/sbin/zebra -d -u root -g root -f /etc/quagga/zebra.conf
+[program:bgpd]
+command=/usr/sbin/bgpd -d -u root -g root -f /etc/quagga/bgpd.conf
diff --git a/docker/zebra.conf b/docker/zebra.conf
new file mode 100644
index 0000000..1146cb2
--- /dev/null
+++ b/docker/zebra.conf
@@ -0,0 +1,5 @@
+!
+hostname quagga-test
+password zebra
+!
+fpm connection ip 172.17.0.2 port 2620