From cafb3a14ef0ca8e8bed45a02c8cd3bf05cf7e779 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 1 Jun 2020 11:21:57 +0200 Subject: [PATCH] CircleCI: Upgrade to Go 1.14.3 and Node 12.17.0 (#25215) Signed-off-by: Arve Knudsen (cherry picked from commit 01ecbae2ee4898e316429d688035254838eccb49) --- .circleci/config.yml | 2 +- scripts/build/ci-build/Dockerfile | 4 ++-- scripts/build/ci-build/build-deploy.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 814412c2883..3b648d96a0a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ executors: - image: cimg/go:1.14 grafana-build: docker: - - image: grafana/build-container:1.2.18 + - image: grafana/build-container:1.2.19 grafana-publish: docker: - image: grafana/grafana-ci-deploy:1.2.5 diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index bb0bc1fec61..ff7f15dd6e1 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -74,10 +74,10 @@ RUN cd /tmp && \ # base image to crossbuild grafana FROM ubuntu:20.04 -ENV GOVERSION=1.14.1 \ +ENV GOVERSION=1.14.3 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=12.13.0 + NODEVERSION=12.17.0 ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index aa00700db28..e7148f10af2 100755 --- a/scripts/build/ci-build/build-deploy.sh +++ b/scripts/build/ci-build/build-deploy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -eo pipefail -_version="1.2.18" +_version="1.2.19" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}")