From 2b89a92bdb11ab47721aa367a990c897af8338f9 Mon Sep 17 00:00:00 2001
From: Suraj Nath <9503187+electron0zero@users.noreply.github.com>
Date: Tue, 20 Aug 2024 01:27:01 +0530
Subject: [PATCH] WIP - don't merge this??

---
 Makefile       | 8 ++++----
 build/tools.mk | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0d409e43ed3..21278a6e4ff 100644
--- a/Makefile
+++ b/Makefile
@@ -271,8 +271,8 @@ gen-proto:  ## Generate proto files
 ##@ Gen Traceql
 
 .PHONY: gen-traceql 
-gen-traceql: ## Generate traceql 
-	docker run --rm -v${PWD}:/src/loki ${LOKI_BUILD_IMAGE} gen-traceql-local
+gen-traceql: ## Generate traceql
+	$(TOOLS_CMD) $(MAKE) gen-traceql-local
 
 .PHONY: gen-traceql-local 
 gen-traceql-local: ## Generate traceq local
@@ -291,7 +291,7 @@ vendor-check: gen-proto update-mod gen-traceql gen-parquet-query ## Keep up to d
 	git diff --exit-code -- **/go.sum **/go.mod vendor/ pkg/tempopb/ pkg/traceql/
 
 ### Tidy dependencies for tempo and tempo-serverless modules
-.PHONY: update-mod 
+.PHONY: update-mod
 update-mod: tools-update-mod ## Update module
 	go mod vendor
 	go mod tidy -e
@@ -355,7 +355,7 @@ drone: ## Run Drone targets
 	# piggyback on Loki's build image, this image contains a newer version of drone-cli than is
 	# released currently (1.4.0). The newer version of drone-clie keeps drone.yml human-readable.
 	# This will run 'make drone-jsonnet' from within the container
-	docker run -e DRONE_SERVER -e DRONE_TOKEN --rm -v $(shell pwd):/src/loki ${LOKI_BUILD_IMAGE} drone-jsonnet drone-signature
+	docker run -e DRONE_SERVER -e DRONE_TOKEN --rm -v $(shell pwd):/tools $(TOOLS_IMAGE):$(TOOLS_IMAGE_TAG) $(MAKE) drone-jsonnet drone-signature
 
 	drone lint .drone/drone.yml --trusted
 
diff --git a/build/tools.mk b/build/tools.mk
index 40b613edbbe..b03751d7dee 100644
--- a/build/tools.mk
+++ b/build/tools.mk
@@ -12,7 +12,7 @@ TOOL_DIR     ?= tools
 TOOL_CONFIG  ?= $(TOOL_DIR)/tools.go
 
 TOOLS_IMAGE ?= grafana/tempo-ci-tools
-TOOLS_IMAGE_TAG ?= main-5e4eafd
+TOOLS_IMAGE_TAG ?= latest
 
 GOTOOLS ?= $(shell cd $(TOOL_DIR) && go list -e -f '{{ .Imports }}' -tags tools |tr -d '[]')