Merge pull request #84 from krezreb/master

Makefile add support for dockerhub image

Author: ddworken

docker/Makefile

@@ -11,7 +11,13 @@ SHELL := /bin/bash
 
 # Build a new docker image for the CA bot
 build: reset-permissions
+ifdef DOCKER_IMAGE
+	docker pull $(DOCKER_IMAGE)
+	docker tag $(DOCKER_IMAGE) ca
+else
 	docker build -t ca -f Dockerfile-ca ..
+endif
+
 
 # Generate a new CA key
 generate: env-file-exists build