IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-26 00:41:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Upgrade Docker images to Go 1.13.1 (#19576)

Browse Source 
* Chore: Upgrade Docker image/CI to Go 1.13.1

Fixes #18878

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Use golangci-lint master revision
This commit is contained in:
Arve Knudsen 2019-10-08 08:32:18 +02:00 committed by GitHub
parent 5202770bdc
commit d8b6a873d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.circleci/config.yml
View File

@ -19,7 +19,7 @@ version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.12.10
- image: circleci/golang:1.13.1
- image: circleci/mysql:5.6-ram
environment:
MYSQL_ROOT_PASSWORD: rootpass
@ -39,7 +39,7 @@ jobs:
postgres-integration-test:
docker:
- image: circleci/golang:1.12.10
- image: circleci/golang:1.13.1
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
@ -58,7 +58,7 @@ jobs:
cache-server-test:
docker:
- image: circleci/golang:1.12.10
- image: circleci/golang:1.13.1
- image: circleci/redis:4-alpine
- image: memcached
working_directory: /go/src/github.com/grafana/grafana
@ -144,7 +144,7 @@ jobs:
lint-go:
docker:
- image: circleci/golang:1.12.10
- image: circleci/golang:1.13.1
environment:
# we need CGO because of go-sqlite3
CGO_ENABLED: 1
@ -185,7 +185,7 @@ jobs:
test-backend:
docker:
- image: circleci/golang:1.12.10
- image: circleci/golang:1.13.1
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -195,7 +195,7 @@ jobs:
build-all:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -239,7 +239,7 @@ jobs:
build:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -268,7 +268,7 @@ jobs:
build-fast-backend:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -285,7 +285,7 @@ jobs:
build-fast-frontend:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -309,7 +309,7 @@ jobs:
build-fast-package:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -336,7 +336,7 @@ jobs:
build-fast-save:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -425,7 +425,7 @@ jobs:
build-enterprise:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@ -460,7 +460,7 @@ jobs:
build-all-enterprise:
docker:
- image: grafana/build-container:1.2.9
- image: grafana/build-container:1.2.10
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout

2
Dockerfile
View File

@ -1,5 +1,5 @@
# Golang build container
FROM golang:1.12.10-alpine
FROM golang:1.13.1-alpine
RUN apk add --no-cache gcc g++

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

@ -71,7 +71,7 @@ RUN apt-get update && \
# base image to crossbuild grafana
FROM ubuntu:14.04
ENV GOVERSION=1.12.10 \
ENV GOVERSION=1.13.1 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=10.14.2

2
scripts/build/ci-build/build-deploy.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -eo pipefail
_version="1.2.9"
_version="1.2.10"
_tag="grafana/build-container:${_version}"
_dpath=$(dirname "${BASH_SOURCE[0]}")

2
scripts/go/go.mod
View File

@ -3,7 +3,7 @@ module github.com/grafana/grafana/scripts/go
go 1.13
require (
github.com/golangci/golangci-lint v1.19.1
github.com/golangci/golangci-lint 7577d548a3893f86cb9aa479b88c52ff5d437893
github.com/mgechev/revive v0.0.0-20190917153825-40564c5052ae
github.com/securego/gosec v0.0.0-20190912120752-140048b2a218
github.com/unknwon/bra v0.0.0-20190805204333-bb0929b6cca0