From 0da1d441afb07e0411cb84ad5ff1a8780429388f Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 15 Nov 2016 09:07:12 -0600 Subject: [PATCH 1/3] Update Dockerfile to use VOLUMEs --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a621a53e..e43b07bf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ MAINTAINER Chris Goller RUN apk add --update ca-certificates && \ rm /var/cache/apk/* -RUN mkdir -p /var/lib/chronograf ADD chronograf /usr/bin/chronograf ADD canned/*.json /usr/share/chronograf/canned/ @@ -11,5 +10,6 @@ ADD LICENSE /usr/share/chronograf/LICENSE ADD agpl-3.0.md /usr/share/chronograf/agpl-3.0.md EXPOSE 8888 +VOLUME ["/usr/share/chronograf", "/var/lib/chronograf"] CMD ["/usr/bin/chronograf", "-b", "/var/lib/chronograf/chronograf-v1.db", "-c", "/usr/share/chronograf/canned"] From b9edf91fba09b0cec8a8c4d1389c09521ad7abb8 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 15 Nov 2016 09:12:41 -0600 Subject: [PATCH 2/3] Update README to mention our quay alpha builds --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 923c8eecf..4051e0f38 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,13 @@ We recommend installing Chronograf using one of the [pre-built packages](https:/ * `systemctl start chronograf` if you have installed Chronograf using an official Debian or RPM package, and are running a distro with `systemd`. For example, Ubuntu 15 or later. * `$GOPATH/bin/chronograf` if you have built Chronograf from source. +### With Docker +To get started right away with Docker, you can pull down our latest alpha: + +```sh +docker pull quay.io/influxdb/chronograf:latest +``` + ### From Source * Chronograf works with go 1.7.3, npm 3.10.7 and node v6.6.0. Additional version support of these projects will be implemented soon, but these are the only supported versions to date. From 8f68b8a9c6b6cd5c48db9af2b1accbeef3fcc0b8 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Tue, 15 Nov 2016 09:12:55 -0600 Subject: [PATCH 3/3] Update circle to push to quay and use go 1.7.3 --- circle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index dbef35060..a841e21a5 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: - docker post: - go version - - go version | grep 1.7.1 || (sudo rm -rf /usr/local/go && wget https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz && sudo tar -C /usr/local -xzf go1.7.1.linux-amd64.tar.gz) + - go version | grep 1.7.3 || (sudo rm -rf /usr/local/go && wget https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz && sudo tar -C /usr/local -xzf go1.7.3.linux-amd64.tar.gz) - go version dependencies: @@ -23,10 +23,10 @@ test: - make test deployment: - heroku: + quayio: branch: master commands: - make docker - - docker login -e $HEROKU_EMAIL -u $HEROKU_EMAIL -p $HEROKU_PASS registry.heroku.com - - docker tag chronograf registry.heroku.com/mrfusion-acc/web - - docker push registry.heroku.com/mrfusion-acc/web + - docker login -e $QUAY_EMAIL -u "$QUAY_USER" -p $QUAY_PASS quay.io + - docker tag chronograf quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7} + - docker push quay.io/influxdb/chronograf:${CIRCLE_SHA1:0:7}