From 1c9ae08e8041ba29161f8b89c229a4a8a9687125 Mon Sep 17 00:00:00 2001
From: Johannes 'fish' Ziemke <github@freigeist.org>
Date: Mon, 5 Aug 2013 14:40:24 +0200
Subject: [PATCH 1/3] Add Dockerfile

---
 Dockerfile | 7 +++++++
 Makefile   | 3 +++
 2 files changed, 10 insertions(+)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..4ad910cae2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,7 @@
+# Cannot use busybox image since Prometheus depends on libc.
+FROM base
+
+MAINTAINER Prometheus Team <prometheus-developers@googlegroups.com>
+EXPOSE 9090
+ENTRYPOINT ["/opt/prometheus"]
+ADD .build/package/ /opt/prometheus
diff --git a/Makefile b/Makefile
index efab123152..fbb51d6342 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ build: config dependencies model preparation tools web
 	cp prometheus $(BUILD_PATH)/package/prometheus
 	rsync -av --delete $(BUILD_PATH)/root/lib/ $(BUILD_PATH)/package/lib/
 
+docker: build
+	docker build -t prometheus:$(REV) .
+
 $(BUILD_PATH)/cache/$(GOPKG):
 	curl -o $@ http://go.googlecode.com/files/$(GOPKG)
 

From b5cc4c6cc8d8120f1054e73092b3dd9de4b3982d Mon Sep 17 00:00:00 2001
From: Johannes 'fish' Ziemke <github@freigeist.org>
Date: Wed, 7 Aug 2013 18:11:35 +0200
Subject: [PATCH 2/3] Fix entrypoint and use base image

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

diff --git a/Dockerfile b/Dockerfile
index 4ad910cae2..b64b574fc4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,5 +3,5 @@ FROM base
 
 MAINTAINER Prometheus Team <prometheus-developers@googlegroups.com>
 EXPOSE 9090
-ENTRYPOINT ["/opt/prometheus"]
+ENTRYPOINT ["/opt/prometheus/run_prometheus.sh"]
 ADD .build/package/ /opt/prometheus

From cc5d4c7edac9b95abac57c8004987bd10d621f91 Mon Sep 17 00:00:00 2001
From: Johannes 'fish' Ziemke <github@freigeist.org>
Date: Mon, 12 Aug 2013 11:19:55 +0200
Subject: [PATCH 3/3] Run prometheus in foreground.

---
 .build/package/run_prometheus.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.build/package/run_prometheus.sh b/.build/package/run_prometheus.sh
index f79e8319d9..12fbee2f4c 100755
--- a/.build/package/run_prometheus.sh
+++ b/.build/package/run_prometheus.sh
@@ -26,4 +26,4 @@ if [[ "${platform}" == "darwin" ]]; then
   export DYLD_LIBRARY_PATH="${binary_directory}/lib:${DYLD_LIBRARY_PATH}"
 fi
 
-"${binary_directory}/prometheus" "${@}" &
+exec "${binary_directory}/prometheus" "${@}"