Merge pull request #415 from peterbourgon/fix-dockerfile

Fix Dockerfile for new repo layout
2014-12-06 13:26:32 +01:00 · 2014-12-06 13:26:32 +01:00 · f71c215454
parent c0e5ac35f0 88019e852a
commit f71c215454
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -4,7 +4,9 @@ EXPOSE     9090
 VOLUME     [ "/prometheus" ]
 WORKDIR    /prometheus

-ENTRYPOINT [ "/prometheus-src/.build/package/run_prometheus.sh" ]
+ENTRYPOINT [ "/prometheus-src/prometheus" ]
+CMD        [ "-config.file=/prometheus.conf" ]
 RUN        apt-get update && apt-get install -yq make git curl sudo mercurial vim-common
 ADD        . /prometheus-src
 RUN        cd /prometheus-src && make tools binary
+ADD        ./documentation/examples/prometheus.conf /prometheus.conf