diff --git a/README.md b/README.md index f3a399597a5..a55874632dd 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Graphite, InfluxDB & OpenTSDB. ![](http://grafana.org/assets/img/start_page_bg.png) -# Grafana 2.0 Alpha branch [![wercker status](https://app.wercker.com/status/1de5ea38f93fd2dfa2eb8b8ba58b6df1/s "wercker status")](https://app.wercker.com/project/bykey/1de5ea38f93fd2dfa2eb8b8ba58b6df1) +# Grafana 2.0 Alpha branch [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) Grafana 2.0 comes with a backend written in Go. It is not ready for production use yet as there is still a lot of small issues to fix and polish missing. But feedback on what is done and bug reports would be greatly appreciated. diff --git a/docker/rpmtest/Dockerfile b/docker/rpmtest/Dockerfile index 363af6de3ca..e13e4abffb0 100644 --- a/docker/rpmtest/Dockerfile +++ b/docker/rpmtest/Dockerfile @@ -1,4 +1,4 @@ -FROM centos:6 +FROM centos:6.6 RUN yum install -y initscripts diff --git a/wercker.yml b/wercker.yml deleted file mode 100644 index fb9d2759678..00000000000 --- a/wercker.yml +++ /dev/null @@ -1,64 +0,0 @@ -box: wercker/golang - -steps: - - wercker/npm-install@0.9.3 - - wercker/step-grunt - - wercker/s3sync - -build: - steps: - # Workspace - - setup-go-workspace - - npm-install - - script: - name: build setup - code: | - go run build.go setup - # Build the project - - script: - name: go build - code: | - go run build.go clean test build - # create packages - - script: - name: create packages latest - code: | - sudo gem install fpm - sudo apt-get update - sudo apt-get install -y rpm - go run build.go package latest - # save packages - - script: - name: copy output - code: |- - rsync -rv "$WERCKER_SOURCE_DIR/dist/" "$WERCKER_OUTPUT_DIR" - -deploy: - steps: - - s3sync: - key-id: $AWS_S3_KEY - key-secret: $AWS_S3_SECRET - bucket-url: $AWS_S3_BUCKET - source-dir: ./ - delete-removed: false - - - add-to-known_hosts: - hostname: play.grafana.org - - mktemp: - envvar: PRIVATEKEY_PATH - - create-file: - name: write key - filename: $PRIVATEKEY_PATH - content: $GRAFANA_PLAY_PRIVATE - overwrite: true - hide-from-log: true - - script: - name: transfer application - code: | - pwd - ls -la - scp -i $PRIVATEKEY_PATH -o StrictHostKeyChecking=no -o UserKnownHostsFile=no * deploy@play.grafana.org:/home/deploy/ - - script: - name: deploy application - code: ssh -i $PRIVATEKEY_PATH -l deploy -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no play.grafana.org ./wercker_deploy.sh -