From dde42091444165691bb28449c09afff18ae2c1a0 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 3 Dec 2014 14:53:35 +0100 Subject: [PATCH 1/3] Fix Dockerfile for new repo layout --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b5644ff2..9b5672864 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,9 @@ EXPOSE 9090 VOLUME [ "/prometheus" ] WORKDIR /prometheus -ENTRYPOINT [ "/prometheus-src/.build/package/run_prometheus.sh" ] +ENTRYPOINT [ "/prometheus-src/prometheus", "-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 + From ec4182c8c75e1cd27ba1e655330e61bfed86f368 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 3 Dec 2014 15:02:37 +0100 Subject: [PATCH 2/3] Remove newline at end of Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b5672864..8ef3af04c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,4 +9,3 @@ RUN apt-get update && apt-get install -yq make git curl sudo mercurial vi ADD . /prometheus-src RUN cd /prometheus-src && make tools binary ADD ./documentation/examples/prometheus.conf /prometheus.conf - From 88019e852aac19891b7a122e882b6511b576402d Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Thu, 4 Dec 2014 20:47:17 +0100 Subject: [PATCH 3/3] Use ENTRYPOINT and CMD --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ef3af04c..672d64c1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ EXPOSE 9090 VOLUME [ "/prometheus" ] WORKDIR /prometheus -ENTRYPOINT [ "/prometheus-src/prometheus", "-config.file=/prometheus.conf" ] +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