diff --git a/docker/production/README.md b/docker/production/README.md
new file mode 100644
index 00000000000..f6da10e62f6
--- /dev/null
+++ b/docker/production/README.md
@@ -0,0 +1,31 @@
+
+# Grafana docker image
+
+This container currently only contains the in development alpha of Grafana 2.0 (ie non production use). The
+`#develop` tag is constantly updated as we make progress torwards a beta release.
+
+
+## Running your Grafana image
+--------------------------
+
+Start your image binding the external port `3000`.
+
+   docker run -i -p 3000:3000 grafana/grafana
+
+Try it out, default admin user is admin/admin.
+
+
+## Configuring your Grafana container
+
+All options defined in conf/grafana.ini can be overriden using environment variables, for example:
+
+
+```
+docker run -i -p 3000:3000 \
+  -e "GF_SERVER_ROOT_URL=http://grafana.server.name"  \
+  -e "GF_SECURITY_ADMIN_PASSWORD=secret  \
+  grafana/grafana:develop
+```
+
+
+
diff --git a/docker/production/build.sh b/docker/production/build.sh
index 4179d8e032e..d97b29de934 100755
--- a/docker/production/build.sh
+++ b/docker/production/build.sh
@@ -5,7 +5,7 @@ cd ../../
 
 go run build.go build
 
-npm grunt release
+grunt release
 
 docker build --tag "grafana/grafana:develop" .
 
diff --git a/docker/production/test_container.sh b/docker/production/test_container.sh
new file mode 100755
index 00000000000..aa8fdba4cbf
--- /dev/null
+++ b/docker/production/test_container.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker run -i -p 3001:3000 \
+  -e "GF_SERVER_ROOT_URL=http://grafana.server.name"  \
+  grafana/grafana:develop