diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..2272667db8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,65 @@
+# VERSION:		  0.1
+# DESCRIPTION:	  Compile and run tor in a container
+# AUTHOR:		  Jessica Frazelle <jess@docker.com>
+# COMMENTS:
+#	This file describes how to build and run tor
+#	in a container with all dependencies installed.
+# USAGE:
+#	# Build tor image
+#	docker build -t tor .
+#
+#	# Run tor
+#	docker run -p 9050:9050 tor
+#
+#	# Run tor tests
+#	docker run tor make check
+
+# Base docker image
+FROM debian:jessie
+
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+	asciidoc \
+	automake \
+	docbook-xsl \
+	docbook-xml \
+	gcc \
+	g++ \
+	libevent-dev \
+	libminiupnpc-dev \
+	libseccomp-dev \
+	libssl-dev \
+	make \
+	xmlto \
+	zlib1g-dev \
+	--no-install-recommends \
+	&& mkdir -p /usr/src/tor
+
+ENV HOME /home/tor
+RUN useradd --create-home --home-dir $HOME tor \
+    && chown -R tor:tor $HOME
+
+
+# Add source files
+COPY . /usr/src/tor
+WORKDIR /usr/src/tor
+
+# Compile & install tor
+RUN ./autogen.sh \
+	&& ./configure \
+	&& make \
+	&& make install \
+	&& chown -R tor:tor /usr/src/tor
+
+RUN { \
+		echo 'VirtualAddrNetworkIPv4 10.192.0.0/10'; \
+		echo 'AutomapHostsOnResolve 1'; \
+		echo 'TransPort 9040'; \
+		echo 'DNSPort 5353'; \
+	} >  /etc/torrc \
+	&& chown tor:tor /etc/torrc
+
+USER tor
+
+# set command as minimal default
+CMD [ "/usr/local/bin/tor", "-f", "/etc/torrc" ]