Add local-docker and docker commands to the Makefile

This simplifies the process of creating and starting a docker container
for Melange.

Change-Id: I27bdbd492d5aabbddac2cdadb328c71c02c06f80
diff --git a/Makefile b/Makefile
index e603640..32844c3 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,8 @@
 help:
 	@echo
 	@echo Common Commands:
+	@echo   local-docker - build and run a local docker container
+	@echo   docker - enter the docker container
 	@echo   setup - setup environment
 	@echo   css - rebuild css
 	@echo   localserver - run local development server
@@ -71,7 +73,18 @@
 # running again unless a dependency has changed.
 clean-setup:
 	rm -f .buildout .initial-setup
-	echo now re-run 'make setup'
+	@echo now re-run 'make setup'
+
+# build and run a local copy of the melange docker container
+local-docker:
+	docker build -t $(USER)/melange .
+	docker run -ti --rm -v $(PWD):/workspace -p 8080:8080 $(USER)/melange
+
+# enter the docker container
+docker:
+	@echo You are now working in a docker container.
+	@echo Type 'exit' to leave the container
+	@docker run -ti --rm -v $(PWD):/workspace -p 8080:8080 melange/melange-dev
 
 # setup target sets up the basics of the development environment
 setup: APP=local-devel