diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..ec9073542d
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,29 @@
+FROM debian:wheezy
+
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
+RUN groupadd -r postgres && useradd -r -g postgres postgres
+
+RUN apt-get update && apt-get install -y curl
+
+RUN curl -o /usr/local/bin/gosu -SL 'https://github.com/tianon/gosu/releases/download/1.0/gosu' \
+	&& chmod +x /usr/local/bin/gosu
+
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
+	&& curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+		| apt-key add - ED6D65271AACF0FF15D123036FB2A1C265FFB764
+
+RUN apt-get update \
+	&& apt-get install -y postgresql-common \
+	&& sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf \
+	&& apt-get install -y postgresql-9.3
+
+ENV PATH /usr/lib/postgresql/9.3/bin:$PATH
+ENV PGDATA /var/lib/postgresql/data
+VOLUME /var/lib/postgresql/data
+
+ADD ./docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 5432
+CMD ["postgres"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000000..5868bad075
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+if [ "$1" = 'postgres' ]; then
+	chown -R postgres "$PGDATA"
+	
+	if [ -z "$(ls -A "$PGDATA")" ]; then
+		gosu postgres initdb
+		
+		sed -ri "s/^#(listen_addresses\s*=\s*)\S+/\1'*'/" "$PGDATA"/postgresql.conf
+		
+		{ echo; echo 'host all all 0.0.0.0/0 trust'; } >> "$PGDATA"/pg_hba.conf
+	fi
+	
+	exec gosu postgres "$@"
+fi
+
+exec "$@"