From f2376d27fc2db7c5641795b9f71a0ce8c107cf1e Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Thu, 26 May 2022 15:01:01 +0200 Subject: [PATCH] Updated build image version Signed-off-by: Marco Pracucci --- .drone/drone.yml | 28 ++++++++++++++-------------- Makefile | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.drone/drone.yml b/.drone/drone.yml index 1ef29ee1c87ac..c9ecaa5532fec 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -41,14 +41,14 @@ steps: depends_on: - clone environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: check-drone-drift - commands: - make BUILD_IN_CONTAINER=false check-generated-files depends_on: - clone environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: check-generated-files - commands: - cd .. @@ -57,7 +57,7 @@ steps: depends_on: - clone environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: clone-main - commands: - make BUILD_IN_CONTAINER=false test @@ -65,7 +65,7 @@ steps: - clone - clone-main environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: test - commands: - cd ../loki-main @@ -73,7 +73,7 @@ steps: depends_on: - clone-main environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: test-main - commands: - make BUILD_IN_CONTAINER=false compare-coverage old=../loki-main/test_results.txt @@ -83,7 +83,7 @@ steps: - test - test-main environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: compare-coverage - commands: - pull=$(echo $CI_COMMIT_REF | awk -F '/' '{print $3}') @@ -96,7 +96,7 @@ steps: TOKEN: from_secret: github_token USER: grafanabot - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: report-coverage - commands: - make BUILD_IN_CONTAINER=false lint @@ -104,7 +104,7 @@ steps: - clone - check-generated-files environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: lint - commands: - make BUILD_IN_CONTAINER=false check-mod @@ -113,7 +113,7 @@ steps: - test - lint environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: check-mod - commands: - apk add make bash && make lint-scripts @@ -125,21 +125,21 @@ steps: - clone - check-generated-files environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: loki - commands: - make BUILD_IN_CONTAINER=false validate-example-configs depends_on: - loki environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: validate-example-configs - commands: - make BUILD_IN_CONTAINER=false check-example-config-doc depends_on: - clone environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: check-example-config-doc trigger: event: @@ -165,7 +165,7 @@ steps: depends_on: - clone environment: {} - image: grafana/loki-build-image:publish-compiled-mixin-a795b93-WIP + image: grafana/loki-build-image:0.21.0 name: loki-mixin-check trigger: event: @@ -1174,6 +1174,6 @@ kind: secret name: deploy_config --- kind: signature -hmac: b4180fa881906cfb08614d0ea8da41bb59e846691391e9f27b2667c3654e7e75 +hmac: cd2881f8ac64b8f4152e9170d02a526b2fb21d10e7ef1a036cd7ecb8d7ea8951 ... diff --git a/Makefile b/Makefile index 1a452698b19e0..c44ad2971ca0c 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES)) BUILD_IN_CONTAINER ?= true # ensure you run `make drone` after changing this -BUILD_IMAGE_VERSION := publish-compiled-mixin-a795b93-WIP +BUILD_IMAGE_VERSION := 0.21.0 # Docker image info IMAGE_PREFIX ?= grafana