Browse Source

Updated readme with docker info, updated build task

Torkel Ödegaard 11 years ago
parent
commit
5c795e9a50
2 changed files with 6 additions and 1 deletions
  1. 5 0
      README.md
  2. 1 1
      tasks/build_task.js

+ 5 - 0
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
 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.
 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
 ## building and running
 
 
 ```
 ```

+ 1 - 1
tasks/build_task.js

@@ -43,7 +43,7 @@ module.exports = function(grunt) {
       });
       });
       grunt.config('copy.backend_files', {
       grunt.config('copy.backend_files', {
         expand: true,
         expand: true,
-        src: ['conf/*', 'vendor/**/*', '!conf/grafana.dev.ini'],
+        src: ['conf/grafana.ini', 'vendor/**/*'],
         options: { mode: true},
         options: { mode: true},
         dest: '<%= tempDir %>'
         dest: '<%= tempDir %>'
       });
       });