Merge pull request #352 from prometheus/feature/dockerify

Feature/dockerify
This commit is contained in:
Johannes 'fish' Ziemke 2013-08-12 06:55:49 -07:00
commit d5f7eeef13
3 changed files with 11 additions and 1 deletions

View File

@ -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" "${@}"

7
Dockerfile Normal file
View File

@ -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/run_prometheus.sh"]
ADD .build/package/ /opt/prometheus

View File

@ -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)