IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build: Upgrade go to 1.12.10 (#19499)

Browse Source 
Fixes #19451
This commit is contained in:
Marcus Efraimsson 2019-09-30 15:41:25 +02:00 committed by GitHub
parent 3866814ea9
commit d65a3318ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 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: jobs:
mysql-integration-test: mysql-integration-test:
docker: docker:
- image: circleci/golang:1.12.9 - image: circleci/golang:1.12.10
- image: circleci/mysql:5.6-ram - image: circleci/mysql:5.6-ram
environment: environment:
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@ -39,7 +39,7 @@ jobs:
postgres-integration-test: postgres-integration-test:
docker: docker:
- image: circleci/golang:1.12.9 - image: circleci/golang:1.12.10
- image: circleci/postgres:9.3-ram - image: circleci/postgres:9.3-ram
environment: environment:
POSTGRES_USER: grafanatest POSTGRES_USER: grafanatest
@ -58,7 +58,7 @@ jobs:
cache-server-test: cache-server-test:
docker: docker:
- image: circleci/golang:1.12.9 - image: circleci/golang:1.12.10
- image: circleci/redis:4-alpine - image: circleci/redis:4-alpine
- image: memcached - image: memcached
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
@ -144,7 +144,7 @@ jobs:
lint-go: lint-go:
docker: docker:
- image: circleci/golang:1.12.9 - image: circleci/golang:1.12.10
environment: environment:
# we need CGO because of go-sqlite3 # we need CGO because of go-sqlite3
CGO_ENABLED: 1 CGO_ENABLED: 1
@ -185,7 +185,7 @@ jobs:
test-backend: test-backend:
docker: docker:
- image: circleci/golang:1.12.9 - image: circleci/golang:1.12.10
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -195,7 +195,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -239,7 +239,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -268,7 +268,7 @@ jobs:
build-fast-backend: build-fast-backend:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -285,7 +285,7 @@ jobs:
build-fast-frontend: build-fast-frontend:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -309,7 +309,7 @@ jobs:
build-fast-package: build-fast-package:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -336,7 +336,7 @@ jobs:
build-fast-save: build-fast-save:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -425,7 +425,7 @@ jobs:
build-enterprise: build-enterprise:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
@ -460,7 +460,7 @@ jobs:
build-all-enterprise: build-all-enterprise:
docker: docker:
- image: grafana/build-container:1.2.8 - image: grafana/build-container:1.2.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout

2
Dockerfile
View File

@ -1,5 +1,5 @@
# Golang build container # Golang build container
FROM golang:1.12.9-alpine FROM golang:1.12.10-alpine
RUN apk add --no-cache gcc g++ 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 # base image to crossbuild grafana
FROM ubuntu:14.04 FROM ubuntu:14.04
ENV GOVERSION=1.12.9 \ ENV GOVERSION=1.12.10 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=10.14.2 NODEVERSION=10.14.2

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

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
_version="1.2.8" _version="1.2.9"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
docker build -t $_tag . docker build -t $_tag .