From 5c795e9a50f77e16f5105b90bf0b0d53b9a485da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 9 Feb 2015 16:18:30 +0100
Subject: [PATCH] Updated readme with docker info, updated build task

---
 README.md           | 5 +++++
 tasks/build_task.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48fc24ce0c7..0e5ae0c7f9c 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ Graphite, InfluxDB & OpenTSDB.
 Grafana 2.0 comes with a backend written in Go. It is not ready for production use yet as there is still a lot of small
 issues to fix and polish missing. But feedback on what is done and bug reports would be greatly appreciated.
 
+## Try it out with docker
+```
+docker run -i -p 3000:3000 grafana/grafana:develop
+```
+
 ## building and running
 
 ```
diff --git a/tasks/build_task.js b/tasks/build_task.js
index bb175dc3bb3..1f6e072603a 100644
--- a/tasks/build_task.js
+++ b/tasks/build_task.js
@@ -43,7 +43,7 @@ module.exports = function(grunt) {
       });
       grunt.config('copy.backend_files', {
         expand: true,
-        src: ['conf/*', 'vendor/**/*', '!conf/grafana.dev.ini'],
+        src: ['conf/grafana.ini', 'vendor/**/*'],
         options: { mode: true},
         dest: '<%= tempDir %>'
       });