diff --git a/.circleci/config.yml b/.circleci/config.yml index ad5988f1c9f..8112e4a6389 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ version: 2 jobs: mysql-integration-test: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.9 - image: circleci/mysql:5.6-ram environment: MYSQL_ROOT_PASSWORD: rootpass @@ -30,7 +30,7 @@ jobs: steps: - checkout - 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: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass - run: @@ -39,7 +39,7 @@ jobs: postgres-integration-test: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.9 - image: circleci/postgres:9.3-ram environment: POSTGRES_USER: grafanatest @@ -58,7 +58,7 @@ jobs: cache-server-test: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.9 - 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.6 + - image: circleci/golang:1.12.9 environment: # we need CGO because of go-sqlite3 CGO_ENABLED: 1 @@ -185,7 +185,7 @@ jobs: test-backend: docker: - - image: circleci/golang:1.12.6 + - image: circleci/golang:1.12.9 working_directory: /go/src/github.com/grafana/grafana steps: - checkout diff --git a/Dockerfile b/Dockerfile index b9519a5ec0c..1ef942285b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Golang build container -FROM golang:1.12.4 +FROM golang:1.12.9 WORKDIR $GOPATH/src/github.com/grafana/grafana diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index b119a0e695c..c47c3c41f3d 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -71,7 +71,7 @@ RUN apt-get update && \ # base image to crossbuild grafana FROM ubuntu:14.04 -ENV GOVERSION=1.12.6 \ +ENV GOVERSION=1.12.9 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ NODEVERSION=10.14.2 diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index 063a1c8cc14..78c48ad29a7 100755 --- a/scripts/build/ci-build/build-deploy.sh +++ b/scripts/build/ci-build/build-deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -_version="1.2.7" +_version="1.2.8" _tag="grafana/build-container:${_version}" docker build -t $_tag .