diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..e535835a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:2
+
+## Maintainer info
+MAINTAINER Logan Garrett <https://github.com/lngarrett>
+
+COPY . .
+CMD [ "python", "PlexPy.py"]
+
diff --git a/README.md b/README.md
index 56a90ac3..7b483311 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![Join the chat at https://gitter.im/drzoidberg33/plexpy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drzoidberg33/plexpy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+[![Circle CI](https://circleci.com/gh/lngarrett/plexpy.svg?style=svg)](https://circleci.com/gh/lngarrett/plexpy)
+
 A python based web application for monitoring, analytics and notifications for Plex Media Server (www.plex.tv).
 
 This project is based on code from Headphones (https://github.com/rembo10/headphones) and PlexWatchWeb (https://github.com/ecleese/plexWatchWeb).
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..31977688
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,25 @@
+machine:
+  services:
+    - docker
+
+dependencies:
+  cache_directories:
+    - "~/docker"
+  override:
+    - docker info
+    - if [[ -e ~/docker/image.tar ]]; then docker load --input ~/docker/image.tar; fi
+    - docker build -t lngarrett/plexpy .
+    - mkdir -p ~/docker; docker save lngarrett/plexpy > ~/docker/image.tar
+
+test:
+  override:
+    - docker run -d -p 8181:8181 lngarrett/plexpy
+    - sleep 60
+    - curl http://localhost:8181
+    
+deployment:
+  hub: 
+    branch: master
+    commands:
+      - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
+      - docker push lngarrett/plexpy
diff --git a/docker_run.sh b/docker_run.sh
new file mode 100755
index 00000000..0bd78552
--- /dev/null
+++ b/docker_run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+docker rm -f plexpy
+docker pull lngarrett/plexpy:latest
+docker run \
+  --name="plexpy" \
+  --publish=8181:8181 \
+  --restart="always" \
+  --detach=true \
+  lngarrett/plexpy