mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #720 from prometheus/update-docker-file-yml-change

Browse source 
Rename refs to prometheus.conf -> prometheus.yml and remove logtostderr flag
This commit is contained in:
Julius Volz 2015-05-22 18:09:17 +02:00
parent 25ce5f8667 6a2983c615
commit 52ef225b83
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -20,7 +20,7 @@ RUN apk add --update -t build-deps go git mercurial vim \
" -o /bin/prometheus \ " -o /bin/prometheus \
&& cd tools/rule_checker && go build -o /bin/rule_checker && cd ../.. \ && cd tools/rule_checker && go build -o /bin/rule_checker && cd ../.. \
&& mkdir -p /etc/prometheus \ && mkdir -p /etc/prometheus \
&& mv ./documentation/examples/prometheus.conf /etc/prometheus/prometheus.conf \ && mv ./documentation/examples/prometheus.yml /etc/prometheus/prometheus.yml \
&& mv ./console_libraries/ ./consoles/ /etc/prometheus/ \ && mv ./console_libraries/ ./consoles/ /etc/prometheus/ \
&& rm -rf /go \ && rm -rf /go \
&& apk del --purge build-deps && apk del --purge build-deps
@ -29,7 +29,7 @@ EXPOSE 9090
VOLUME [ "/prometheus" ] VOLUME [ "/prometheus" ]
WORKDIR /prometheus WORKDIR /prometheus
ENTRYPOINT [ "/bin/prometheus" ] ENTRYPOINT [ "/bin/prometheus" ]
CMD [ "-logtostderr", "-config.file=/etc/prometheus/prometheus.conf", \ CMD [ "-config.file=/etc/prometheus/prometheus.yml", \
"-storage.local.path=/prometheus", \ "-storage.local.path=/prometheus", \
"-web.console.libraries=/etc/prometheus/console_libraries", \ "-web.console.libraries=/etc/prometheus/console_libraries", \
"-web.console.templates=/etc/prometheus/consoles" ] "-web.console.templates=/etc/prometheus/consoles" ]