From 15ece1da0402c9716d0609d592762ca6fd7de042 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 5 Oct 2017 09:01:56 +0200 Subject: [PATCH 1/2] changes go version to 1.9.1 --- appveyor.yml | 2 +- circle.yml | 2 +- docs/sources/project/building_from_source.md | 2 +- scripts/build/Dockerfile | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d626f6bd93f..19de1d3a793 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ clone_folder: c:\gopath\src\github.com\grafana\grafana environment: nodejs_version: "6" GOPATH: c:\gopath - GOVERSION: 1.9 + GOVERSION: 1.9.1 install: - rmdir c:\go /s /q diff --git a/circle.yml b/circle.yml index 0d535a9c1c2..ba44172ddf3 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ machine: GOPATH: "/home/ubuntu/.go_workspace" ORG_PATH: "github.com/grafana" REPO_PATH: "${ORG_PATH}/grafana" - GODIST: "go1.9.linux-amd64.tar.gz" + GODIST: "go1.9.1.linux-amd64.tar.gz" post: - mkdir -p ~/download - mkdir -p ~/docker diff --git a/docs/sources/project/building_from_source.md b/docs/sources/project/building_from_source.md index c3f65db618d..f8dcc9a949c 100644 --- a/docs/sources/project/building_from_source.md +++ b/docs/sources/project/building_from_source.md @@ -13,7 +13,7 @@ dev environment. Grafana ships with its own required backend server; also comple ## Dependencies -- [Go 1.9](https://golang.org/dl/) +- [Go 1.9.1](https://golang.org/dl/) - [NodeJS LTS](https://nodejs.org/download/) - [Git](https://git-scm.com/downloads) diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile index da9a99706bb..58a3c65a63f 100644 --- a/scripts/build/Dockerfile +++ b/scripts/build/Dockerfile @@ -23,10 +23,10 @@ RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash - && \ RUN wget https://dl.yarnpkg.com/rpm/yarn.repo -O /etc/yum.repos.d/yarn.repo && \ 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/go1.9.1.linux-amd64.tar.gz && \ + tar -C /usr/local -xzf go1.9.1.linux-amd64.tar.gz -ENV GOLANG_VERSION 1.9 +ENV GOLANG_VERSION 1.9.1 ENV PATH /usr/local/go/bin:$PATH RUN mkdir -p /go/src /go/bin && chmod -R 777 /go From eeb2e2c6c94328bef54f9bd49a76ed0dc395145e Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 5 Oct 2017 10:21:44 +0200 Subject: [PATCH 2/2] build: install go based on env variable --- scripts/build/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/build/Dockerfile b/scripts/build/Dockerfile index 58a3c65a63f..89b0a1a46dd 100644 --- a/scripts/build/Dockerfile +++ b/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 - && \ 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 && \ yum install -y yarn --nogpgcheck && \ - wget https://storage.googleapis.com/golang/go1.9.1.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go1.9.1.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.1 ENV PATH /usr/local/go/bin:$PATH RUN mkdir -p /go/src /go/bin && chmod -R 777 /go