diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ee5dc44
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,37 @@
+*.class
+*.pyc
+*.pyo
+*.o
+*.so
+*.os
+*.pyd
+*.elc
+*~
+.*.swp
+.*.swo
+.*.swn
+.~
+.DS_Store
+.ropeproject
+ID
+__pycache__/
+/build/
+/dist/
+/*.egg*
+/MANIFEST
+/README.html
+/pypi-server-standalone.py
+/.project
+/.pydevproject
+/.tox/
+/*.egg-info/
+/.standalone
+/.coverage
+/htmlcov/
+/.installed.cfg
+/develop-eggs/
+/eggs/
+/parts/
+/.cache/
+/.settings/
+Dockerfile
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..d27b5ba
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.4
+
+# Build
+COPY . /code
+WORKDIR /code
+RUN python setup.py install
+RUN pip install passlib
+WORKDIR /
+RUN rm -rf /pypiserver
+
+# Data Directory
+RUN mkdir -p /data/packages
+WORKDIR /data
+
+ENTRYPOINT ["pypi-server"]
+CMD ["-p", "80", "packages"]
+EXPOSE 80
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..b723ee9
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,7 @@
+pypiserver:
+  image: pypiserver
+  volumes:
+    - /var/pypiserver:/data
+  command: -p 80 -P /data/.htaccess -a update,download,list /data/packages
+  ports:
+    - "8080:80"