From d32635ef880f09d9a5f2dec3721e6aa7a34b26b7 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Fri, 27 Jan 2017 15:31:04 -0600 Subject: [PATCH 1/2] Update to Go version 1.7.5 --- CONTRIBUTING.md | 4 ++-- README.md | 2 +- circle.yml | 6 +++--- etc/Dockerfile_build | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8b186652a..27f84f45c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,8 +58,8 @@ After installing gvm you can install and set the default go version by running the following: ```bash - gvm install go1.7.4 - gvm use go1.7.4 --default + gvm install go1.7.5 + gvm use go1.7.5 --default ``` Installing GDM diff --git a/README.md b/README.md index 0d6804836..bb2855788 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ docker pull quay.io/influxdb/chronograf:latest ### From Source -* Chronograf works with go 1.7.4, 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. +* Chronograf works with go 1.7.x, 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. * Chronograf requires [Kapacitor](https://github.com/influxdata/kapacitor) 1.1.x to create and store alerts. 1. [Install Go](https://golang.org/doc/install) diff --git a/circle.yml b/circle.yml index 881ead70f..3adaaff2b 100644 --- a/circle.yml +++ b/circle.yml @@ -26,7 +26,7 @@ deployment: --package --platform all --arch all - --upload + --upload-overwrite - sudo chown -R ubuntu:ubuntu /home/ubuntu - cp build/linux/static_amd64/chronograf . - docker build -t chronograf . @@ -46,7 +46,7 @@ deployment: --package --platform all --arch all - --upload + --upload-overwrite --bucket dl.influxdata.com/chronograf/releases - sudo chown -R ubuntu:ubuntu /home/ubuntu - cp build/linux/static_amd64/chronograf . @@ -67,7 +67,7 @@ deployment: --package --platform all --arch all - --upload + --upload-overwrite --bucket dl.influxdata.com/chronograf/releases - sudo chown -R ubuntu:ubuntu /home/ubuntu - cp build/linux/static_amd64/chronograf . diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index 7d4bc576c..99a5cda00 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -28,7 +28,7 @@ RUN npm install npm -g # Install go ENV GOPATH /root/go -ENV GO_VERSION 1.7.4 +ENV GO_VERSION 1.7.5 ENV GO_ARCH amd64 RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \ tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \ From 1adec2dd1d53c0f7d01ca1292781d064d853d888 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Fri, 27 Jan 2017 15:48:37 -0600 Subject: [PATCH 2/2] Update to node 6.9.4 and mention support for node 7 --- README.md | 2 +- etc/Dockerfile_build | 6 +++--- etc/README.md | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 etc/README.md diff --git a/README.md b/README.md index bb2855788..e78ccc6cc 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ docker pull quay.io/influxdb/chronograf:latest ### From Source -* Chronograf works with go 1.7.x, 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. +* Chronograf works with go 1.7.x, node 6.x/7.x, and npm 3.x. * Chronograf requires [Kapacitor](https://github.com/influxdata/kapacitor) 1.1.x to create and store alerts. 1. [Install Go](https://golang.org/doc/install) diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build index 99a5cda00..72d8daa23 100644 --- a/etc/Dockerfile_build +++ b/etc/Dockerfile_build @@ -16,9 +16,9 @@ RUN pip install boto requests python-jose --upgrade RUN gem install fpm # Install node -RUN wget -q https://nodejs.org/dist/latest-v6.x/node-v6.9.1-linux-x64.tar.gz; \ - tar -xvf node-v6.9.1-linux-x64.tar.gz -C / --strip-components=1; \ - rm -f node-v6.9.1-linux-x64.tar.gz +RUN wget -q https://nodejs.org/dist/latest-v6.x/node-v6.9.4-linux-x64.tar.gz; \ + tar -xvf node-v6.9.4-linux-x64.tar.gz -C / --strip-components=1; \ + rm -f node-v6.9.4-linux-x64.tar.gz # Update npm RUN cd $(npm root -g)/npm \ diff --git a/etc/README.md b/etc/README.md new file mode 100644 index 000000000..1f4f9d013 --- /dev/null +++ b/etc/README.md @@ -0,0 +1,12 @@ +## Builds + +Builds are run from a docker build image that is configured with the node and go we support. +Our circle.yml uses this docker container to build, test and create release packages. + +### Updating new node/go versions +After updating the Dockerfile_build run + +`docker build -t quay.io/influxdb/builder:chronograf-$(date "+%Y%m%d") -f Dockerfile_build` + +and push to quay with: +`docker push quay.io/influxdb/builder:chronograf-$(date "+%Y%m%d")`