diff --git a/docker/Dockerfile b/docker/Dockerfile
index 05cc2c4..68a36f0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 FROM gliderlabs/alpine
 
-ADD build/discourse-auth-proxy /bin/discourse-auth-proxy
+ADD build_image/discourse-auth-proxy /bin/discourse-auth-proxy
 
 CMD ["/bin/discourse-auth-proxy"]
diff --git a/docker/build.rb b/docker/build.rb
new file mode 100644
index 0000000..2683ad6
--- /dev/null
+++ b/docker/build.rb
@@ -0,0 +1,39 @@
+require 'pty'
+
+version = "1.0.0"
+
+def run(command)
+  lines = []
+  PTY.spawn(command) do |stdin, stdout, pid|
+    begin
+      stdin.each do |line|
+        lines << line
+        puts line
+      end
+    rescue Errno::EIO
+      # we are done
+    end
+  end
+
+  lines
+end
+
+
+def build(path)
+  lines = run("cd #{path} && docker build --nocache .")
+  lines[-1]["successfully built ".length..-1].strip
+end
+
+img = build("build_image")
+pwd = `pwd`.strip
+run "docker run --rm -it -v #{pwd}/build_image:/shared #{img}"
+
+repo = "samsaffron/discourse-auth-proxy"
+tag = "#{repo}:#{version}"
+latest = "#{repo}:#{latest}"
+
+img = build(".")
+run "docker tag #{img} #{tag}"
+run "docker tag #{img} #{latest}"
+
+
diff --git a/docker/build/Dockerfile b/docker/build_image/Dockerfile
similarity index 100%
rename from docker/build/Dockerfile
rename to docker/build_image/Dockerfile