diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..5f7d63184049416f0ef770fa7941c0d440408f43
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,39 @@
+FROM python:2.7.13-alpine
+
+ARG SICKRAGE_VERSION
+
+ENV PID_FILE /var/run/sickrage/sickrage.pid
+ENV DATA_DIR /data
+ENV CONF_DIR /config/
+ENV PUID 1000
+ENV PGID 1000
+
+RUN apk update && \
+    apk add git
+
+RUN addgroup -g ${PGID} sickrage && \
+    adduser -u ${PUID} -D -S -G sickrage sickrage
+
+RUN git config --global advice.detachedHead false && \
+    git clone --quiet https://github.com/SickRage/SickRage/ --branch $SICKRAGE_VERSION --single-branch --depth=1 /app/sickrage
+
+RUN mkdir /var/run/sickrage/ && \
+    chown sickrage. /var/run/sickrage/ && \
+    mkdir /config/ && \
+    chown sickrage. /config && \
+    mkdir /data/ && \
+    chown sickrage. /data
+
+RUN echo '[General]' > /config/config.ini; if [ "$SICKRAGE_VERSION" = "master" ]; then echo 'auto_update = 1' >> /config/config.ini ; else echo 'auto_update = 0' >> /config/config.ini ; fi
+
+RUN if [ "$SICKRAGE_VERSION" = "master" ]; then chown -R sickrage. /app/sickrage/ ; fi
+
+VOLUME ["/config","/data"]
+
+USER sickrage
+
+WORKDIR /app/sickrage/
+
+CMD /usr/local/bin/python SickBeard.py -q --nolaunch --pidfile=${PID_FILE} --config=${CONF_DIR}/config.ini --datadir=${DATA_DIR} ${EXTRA_DAEMON_OPTS}
+
+EXPOSE 8081
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bb3bc48d4560711893061d0a2319a05dc9051d5e
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,12 @@
+version: '2'
+
+services:
+  sickrage:
+    image: sickrage:v2017.06.05-1
+    container_name: sickrage
+    restart: unless-stopped
+    ports:
+      - 8081:8081
+    volumes:
+      - /docker/sickrage/config:/config
+      - /docker/sickrage/data:/data