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

Build: Upgrade to go 1.12.9 (#18638)

Browse Source 
* Build: Upgrade to go 1.12.9

* Build: Use default-mysql-client for debian buster

The go base image has been updated to use Debian Buster instead of
Stretch, which seems to have done away with mysql-client in favor of
default-mysql-client.

* Build: Update Dockerfile to use go 1.12.9

Fixes #18592
This commit is contained in:
Marcus Olsson
2019-08-20 12:29:42 +02:00
committed by GitHub
parent faabb839e6
commit 299a0e20f4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+6 -6
View File
@@ -19,7 +19,7 @@ version: 2
jobs: jobs:
mysql-integration-test: mysql-integration-test:
docker: docker:
- image: circleci/golang:1.12.6 - image: circleci/golang:1.12.9
- image: circleci/mysql:5.6-ram - image: circleci/mysql:5.6-ram
environment: environment:
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
@@ -30,7 +30,7 @@ jobs:
steps: steps:
- checkout - checkout
- run: sudo apt update - run: sudo apt update
- run: sudo apt install -y mysql-client - run: sudo apt install -y default-mysql-client
- run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s - run: dockerize -wait tcp://127.0.0.1:3306 -timeout 120s
- run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass - run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
- run: - run:
@@ -39,7 +39,7 @@ jobs:
postgres-integration-test: postgres-integration-test:
docker: docker:
- image: circleci/golang:1.12.6 - image: circleci/golang:1.12.9
- 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.6 - image: circleci/golang:1.12.9
- 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.6 - image: circleci/golang:1.12.9
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.6 - image: circleci/golang:1.12.9
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
Dockerfile
+1 -1
View File
@@ -1,5 +1,5 @@
# Golang build container # Golang build container
FROM golang:1.12.4 FROM golang:1.12.9
WORKDIR $GOPATH/src/github.com/grafana/grafana WORKDIR $GOPATH/src/github.com/grafana/grafana
scripts/build/ci-build/Dockerfile
+1 -1
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.6 \ ENV GOVERSION=1.12.9 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=10.14.2 NODEVERSION=10.14.2
scripts/build/ci-build/build-deploy.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
_version="1.2.7" _version="1.2.8"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
docker build -t $_tag . docker build -t $_tag .