From 70bf9910a472ad0542963706091f7b427510d616 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 2 Oct 2016 11:26:33 +0100
Subject: [PATCH 1/5] feat: Add a Docker image for Bladerunner

---
 Dockerfile | 7 +++++++
 Makefile   | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 Makefile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..a76d699
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+FROM python:2.7
+
+ADD . /app
+WORKDIR /app
+RUN python ./setup.py install
+
+CMD ["bladerunner"]
\ No newline at end of file
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..64c518b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+build:
+    @docker build -t demonware/bladerunner:latest .
+
+push:
+    @docker push demonware/bladerunner:latest
\ No newline at end of file

From 565f801eaeb19a9b52125830149c25651dfd6fdd Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 2 Oct 2016 11:27:27 +0100
Subject: [PATCH 2/5] tweak: Follow install instructions to the letter for
 Docker

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index a76d699..6150487 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@ FROM python:2.7
 
 ADD . /app
 WORKDIR /app
+RUN python ./setup.py build
 RUN python ./setup.py install
 
 CMD ["bladerunner"]
\ No newline at end of file

From caa8d410605929318b369ff6ef7b9fa8540bca3c Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 2 Oct 2016 11:39:34 +0100
Subject: [PATCH 3/5] fix: Correct Makefile format

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 64c518b..7a2473a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
+DOCKER_TAG ?= latest
+
+default: build push
+
 build:
-    @docker build -t demonware/bladerunner:latest .
+	echo "Building Docker Image for $DOCKER_TAG"
+	docker build -t demonware/bladerunner:$(DOCKER_TAG) .
 
 push:
-    @docker push demonware/bladerunner:latest
\ No newline at end of file
+	docker push demonware/bladerunner:$(DOCKER_TAG)
\ No newline at end of file

From cd51c825fd98faa8b00141b52617855cd5869f9e Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 2 Oct 2016 11:39:47 +0100
Subject: [PATCH 4/5] feat: Add a dockerignore file

---
 .dockerignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..1ee261c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+Makefile
+README.md
+docs/
+test/
\ No newline at end of file

From 1bcb2093dc15e2b85b0d87a94285f8099343a547 Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Sun, 2 Oct 2016 11:55:38 +0100
Subject: [PATCH 5/5] fix: Ensure we install prerequisite packages for Python

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 6150487..50186bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM python:2.7
 
+RUN pip install pexpect futures==2.1.3
+
 ADD . /app
 WORKDIR /app
 RUN python ./setup.py build