From 88019e852aac19891b7a122e882b6511b576402d Mon Sep 17 00:00:00 2001
From: Peter Bourgon <peter@bourgon.org>
Date: Thu, 4 Dec 2014 20:47:17 +0100
Subject: [PATCH] Use ENTRYPOINT and CMD

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ef3af04c9..672d64c1c3 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