浏览代码

Updated dockerfile and moved to docker/production folder

Torkel Ödegaard 11 年之前
父节点
当前提交
441e2ad2f3
共有 2 个文件被更改,包括 16 次插入0 次删除
  1. 1 0
      docker/production/Dockerfile
  2. 15 0
      docker/production/build.sh

+ 1 - 0
Dockerfile → docker/production/Dockerfile

@@ -10,6 +10,7 @@ ADD tmp/ /opt/grafana/
 EXPOSE 3000
 
 VOLUME ["/opt/grafana/data"]
+VOLUME ["/opt/grafana/conf"]
 
 WORKDIR /opt/grafana/
 ENTRYPOINT ["./grafana", "web"]

+ 15 - 0
docker/production/build.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+cp Dockerfile ../../
+cd ../../
+
+go run build.go build
+
+npm grunt release
+
+docker build --tag "grafana/grafana:develop" .
+
+rm Dockerfile
+cd docker/production
+
+