IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade to Go 1.15.1 (#27326)

Browse Source 
* Chore: Upgrade to Go 1.15.1
This commit is contained in:
Arve Knudsen 2020-09-02 15:51:19 +02:00 committed by GitHub
parent 636dd96c28
commit 19c8097595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
FROM golang:1.14.7-alpine3.12 as go-builder
FROM golang:1.15.1-alpine3.12 as go-builder
RUN apk add --no-cache gcc g++

2
Dockerfile.ubuntu
View File

@ -16,7 +16,7 @@ COPY emails emails
ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
FROM golang:1.14.7 AS go-builder
FROM golang:1.15.1 AS go-builder
WORKDIR /src/grafana

2
devenv/docker/blocks/prometheus_random_data/Dockerfile
View File

@ -1,7 +1,7 @@
# This Dockerfile builds an image for a client_golang example.
# Builder image, where we build the example.
FROM golang:1.14.1 AS builder
FROM golang:1.15.1 AS builder
# Download prometheus/client_golang/examples/random first
RUN go get github.com/prometheus/client_golang/examples/random
WORKDIR /go/src/github.com/prometheus/client_golang

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/grafana/grafana
go 1.14
go 1.15
// Override xorm's outdated go-mssqldb dependency, since we can't upgrade to current xorm (due to breaking changes).
// We need a more current go-mssqldb so we get rid of a version of apache/thrift with vulnerabilities.

2
packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
View File

@ -2,7 +2,7 @@
source "./deploy-common.sh"
# Install Go
filename="go1.14.linux-amd64.tar.gz"
filename="go1.15.1.linux-amd64.tar.gz"
get_file "https://dl.google.com/go/$filename" "/tmp/$filename" "08df79b46b0adf498ea9f320a0f23d6ec59e9003660b4c9c1ce8e5e2c6f823ca"
untar_file "/tmp/$filename"

2
scripts/build/ci-build/Dockerfile
View File

@ -85,7 +85,7 @@ RUN mv golangci-lint-${GOLANGCILINT_VERSION}-linux-amd64/golangci-lint /tmp/
# Use old Debian (this has support into 2022) in order to ensure binary compatibility with older glibc's.
FROM debian:stretch-20200803
ENV GOVERSION=1.14.7 \
ENV GOVERSION=1.15.1 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=12.18.3-1nodesource1 \

2
scripts/build/ci-deploy/Dockerfile
View File

@ -1,4 +1,4 @@
FROM cimg/go:1.14
FROM cimg/go:1.15.1
RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly
RUN cd $GOPATH/src/github.com/aptly-dev/aptly && \