public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Upgrades to golang 1.12.6 (#17542)

Browse Source
This commit is contained in:
Kyle Brandt
2019-06-13 11:08:48 +02:00
committed by Carl Bergquist
parent 6170a039e5
commit 073851f9c7
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+13 -13
View File
@@ -19,7 +19,7 @@ version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.12.4
- image: circleci/golang:1.12.6
- 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.4
- image: circleci/golang:1.12.6
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
@@ -58,7 +58,7 @@ jobs:
cache-server-test:
docker:
- image: circleci/golang:1.12.4
- image: circleci/golang:1.12.6
- image: circleci/redis:4-alpine
- image: memcached
working_directory: /go/src/github.com/grafana/grafana
@@ -116,7 +116,7 @@ jobs:
backend-lint:
docker:
- image: circleci/golang:1.12.4
- image: circleci/golang:1.12.6
environment:
# we need CGO because of go-sqlite3
CGO_ENABLED: 1
@@ -148,7 +148,7 @@ jobs:
test-backend:
docker:
- image: circleci/golang:1.12.4
- image: circleci/golang:1.12.6
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -158,7 +158,7 @@ jobs:
build-all:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -202,7 +202,7 @@ jobs:
build:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -228,7 +228,7 @@ jobs:
build-fast-backend:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -245,7 +245,7 @@ jobs:
build-fast-frontend:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -269,7 +269,7 @@ jobs:
build-fast-package:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -296,7 +296,7 @@ jobs:
build-fast-save:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -382,7 +382,7 @@ jobs:
build-enterprise:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -414,7 +414,7 @@ jobs:
build-all-enterprise:
docker:
- image: grafana/build-container:1.2.6
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
scripts/build/ci-build/Dockerfile
+3 -1
View File
@@ -35,6 +35,8 @@ RUN apt-get update && \
curl \
git \
make \
cmake \
libssl-dev \
xz-utils && \
git clone https://github.com/tpoechtrager/osxcross.git /tmp/osxcross && \
curl -L ${OSX_SDK_URL}/${OSX_SDK}.tar.xz -o /tmp/osxcross/tarballs/${OSX_SDK}.tar.xz && \
@@ -69,7 +71,7 @@ RUN apt-get update && \
# base image to crossbuild grafana
FROM ubuntu:14.04
ENV GOVERSION=1.12.4 \
ENV GOVERSION=1.12.6 \
PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \
NODEVERSION=10.14.2
scripts/build/ci-build/build-deploy.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash
_version="1.2.6"
_version="1.2.7"
_tag="grafana/build-container:${_version}"
docker build -t $_tag .