From 941cd59894ae665f062d7848a88a3d562d4b2ba4 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 14 Apr 2020 16:59:45 +0200 Subject: [PATCH] grafana-build-container: Update armv7 musl compiler (#23558) * grafana-build-container: Update armv7 musl compiler Signed-off-by: Arve Knudsen * grafana-build-container: Bump version Signed-off-by: Arve Knudsen * CircleCI: Use newer grafana/build-container image Signed-off-by: Arve Knudsen --- .circleci/config.yml | 4 ++-- scripts/build/ci-build/Dockerfile | 2 +- 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 b52c34675b2..4c73b987485 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ executors: - image: cimg/go:1.14 grafana-build: docker: - - image: grafana/build-container:1.2.14 + - image: grafana/build-container:1.2.15 grafana-publish: docker: - image: grafana/grafana-ci-deploy:1.2.5 @@ -731,7 +731,7 @@ jobs: golangci-lint run -v -j 4 --config scripts/go/configs/ci/.golangci.yml -E unconvert -E unused \ -E varcheck -E goconst -E errcheck -E staticcheck ./pkg/... ./scripts/go/bin/revive -formatter stylish -config ./scripts/go/configs/revive.toml ./pkg/... - ./scripts/go/bin/revive -formatter stylish ./pkg/services/alerting/... + ./scripts/go/bin/revive -formatter stylish ./pkg/services/alerting/... ./scripts/go/bin/revive -formatter stylish ./pkg/services/provisioning/datasources/... ./scripts/go/bin/gosec -quiet -exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \ -conf=./scripts/go/configs/gosec.json ./pkg/... diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 7d73de86143..69b10687482 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -109,7 +109,7 @@ RUN apt-get update && \ | tar -xz -C /usr/local && \ git clone https://github.com/raspberrypi/tools.git /opt/rpi-tools --depth=1 -ARG CHKSUM_ARMV7_MUSL=5c833e744ee1b8f644e9cb34d0219d5cebcb70cf89e9bf996ae846577f7d96da696dce34fbe6ef3888a70842182195e9308838eaec9107ab660addf952e134bf +ARG CHKSUM_ARMV7_MUSL=a4aa497ca7aab6451d2f9dd82a649d92c4e280aa8cab9eabf5c2139472839b34549f3fbfc73d6d2435519f204ff9a419a470105530be346fcfcfe7d0322549f8 ARG CHKSUM_ARMV8_MUSL=50f4899cc2f637dbc39470bbe307074ccf7f40da2ab730218d13a9f75d578266311db6a0785919dcdcb5e7ce4517b13ee8d4a56d76e6fca7c6d4c2510d71aa8b ARG CHKSUM_AMD64_MUSL=493a79e9e29a1eab3fdff6435bac6509253d2e54ac30ad9098ce5da638bbb8ad18a7ebf3520bcaf2f9588befeff23402d8bbf54fa3809bfe18c984a4ecabcb12 diff --git a/scripts/build/ci-build/build-deploy.sh b/scripts/build/ci-build/build-deploy.sh index f75406cd6f0..d7bcea7a680 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.14" +_version="1.2.15" _tag="grafana/build-container:${_version}" _dpath=$(dirname "${BASH_SOURCE[0]}")