Merge pull request #859 from sdurrheimer/circleci

Add circleci yaml for Dockerfile test build
This commit is contained in:
Julius Volz 2015-07-02 14:06:07 +02:00
commit 78f4da8bf1
3 changed files with 13 additions and 2 deletions

View file

@ -30,7 +30,7 @@ build: dependencies $(GOPATH)
$(GO) build -o prometheus $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/prometheus $(GO) build -o prometheus $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/prometheus
$(GO) build -o promtool $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/promtool $(GO) build -o promtool $(BUILDFLAGS) github.com/prometheus/prometheus/cmd/promtool
docker: build docker:
docker build -t prometheus:$(REV) . docker build -t prometheus:$(REV) .
tarball: $(ARCHIVE) tarball: $(ARCHIVE)

View file

@ -1,4 +1,4 @@
# Prometheus [![Build Status](https://travis-ci.org/prometheus/prometheus.svg)](https://travis-ci.org/prometheus/prometheus) # Prometheus [![Build Status](https://travis-ci.org/prometheus/prometheus.svg)](https://travis-ci.org/prometheus/prometheus) [![Circle CI](https://circleci.com/gh/prometheus/prometheus/tree/master.svg?style=svg)](https://circleci.com/gh/prometheus/prometheus/tree/master)
Prometheus is a systems and service monitoring system. It collects metrics Prometheus is a systems and service monitoring system. It collects metrics
from configured targets at given intervals, evaluates rule expressions, from configured targets at given intervals, evaluates rule expressions,

11
circle.yml Normal file
View file

@ -0,0 +1,11 @@
machine:
services:
- docker
dependencies:
override:
- make docker
test:
override:
- /bin/true