From f5233f32af229e9a6d11d2028e6065ea12da1509 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Fri, 29 May 2020 11:39:30 +0200 Subject: [PATCH] CircleCI: Upgrade build image (#25189) * CircleCI: Upgrade build image * CircleCI: Upgrade grabpl Signed-off-by: Arve Knudsen (cherry picked from commit f0eb124278492928b7ffb0b38cce60d2b68d25cb) --- .circleci/config.yml | 11 +++-------- scripts/build/ci-build/build-deploy.sh | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e601e946f03..f85ba69711d 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.16 + - image: grafana/build-container:1.2.17 grafana-publish: docker: - image: grafana/grafana-ci-deploy:1.2.5 @@ -56,7 +56,7 @@ commands: - run: name: "Install Grafana build pipeline tool" command: | - VERSION=0.4.10 + VERSION=0.4.11 curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl chmod +x grabpl mv grabpl /tmp @@ -889,18 +889,13 @@ jobs: when: on_success build-docs-website: - executor: grafana-build + executor: base steps: - checkout - setup_remote_docker - run: name: CI job started command: "./scripts/ci-job-started.sh" - - run: - name: Install docker - command: | - apt-get update - apt-get install -y docker.io - run: name: Build Grafana docs website command: | diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index 07ac09c8be2..6915b5ed05f 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.16" +_version="1.2.17" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}")