Merge branch 'go1.9.1'

appveyor.yml

@@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana
 environment:
 environment:
   nodejs_version: "6"
   nodejs_version: "6"
   GOPATH: c:\gopath
   GOPATH: c:\gopath
-  GOVERSION: 1.9
+  GOVERSION: 1.9.1
 
 
 install:
 install:
   - rmdir c:\go /s /q
   - rmdir c:\go /s /q

circle.yml

@@ -9,7 +9,7 @@ machine:
     GOPATH: "/home/ubuntu/.go_workspace"
     GOPATH: "/home/ubuntu/.go_workspace"
     ORG_PATH: "github.com/grafana"
     ORG_PATH: "github.com/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
     REPO_PATH: "${ORG_PATH}/grafana"
-    GODIST: "go1.9.linux-amd64.tar.gz"
+    GODIST: "go1.9.1.linux-amd64.tar.gz"
   post:
   post:
     - mkdir -p ~/download
     - mkdir -p ~/download
     - mkdir -p ~/docker
     - mkdir -p ~/docker

docs/sources/project/building_from_source.md

@@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple
 
 
 ## Dependencies
 ## Dependencies
 
 
-- [Go 1.9](https://golang.org/dl/)
+- [Go 1.9.1](https://golang.org/dl/)
 - [NodeJS LTS](https://nodejs.org/download/)
 - [NodeJS LTS](https://nodejs.org/download/)
 - [Git](https://git-scm.com/downloads)
 - [Git](https://git-scm.com/downloads)
 
 

scripts/build/Dockerfile

@@ -21,12 +21,14 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380
 RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
 RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \
     yum install -y nodejs --nogpgcheck
     yum install -y nodejs --nogpgcheck
 
 
+ENV GOLANG_VERSION 1.9.1
+
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
 RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \
     yum install -y yarn --nogpgcheck && \
     yum install -y yarn --nogpgcheck && \
-    wget https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzf go1.9.linux-amd64.tar.gz
+    wget https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz
+
 
 
-ENV GOLANG_VERSION 1.9
 ENV PATH /usr/local/go/bin:$PATH
 ENV PATH /usr/local/go/bin:$PATH
 
 
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
 RUN mkdir -p /go/src /go/bin && chmod -R 777 /go