Update tools image in the Makefile (grafana#4468)

* Update tools image in the Makefile * Skip docker-ci-tools workflow in forks
knylander-grafana · Dec 18, 2024 · a2039e9 · a2039e9
1 parent d02611a
commit a2039e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/docker-ci-tools.yml b/.github/workflows/docker-ci-tools.yml
@@ -17,6 +17,7 @@ permissions:
 jobs:
 
   get-image-tag:
+    if: github.repository == 'grafana/tempo'  # skip in forks
     runs-on: ubuntu-24.04
     outputs:
       tag: ${{ steps.get-tag.outputs.tag }}
@@ -29,6 +30,7 @@ jobs:
           echo "tag=$(./tools/image-tag)" >> "$GITHUB_OUTPUT"
 
   docker-ci-tools:
+    if: github.repository == 'grafana/tempo'
     needs: get-image-tag
     strategy:
       matrix:
@@ -50,6 +52,7 @@ jobs:
           docker push $IMAGE_NAME:$TAG_ARCH
 
   manifest:
+    if: github.repository == 'grafana/tempo'
     needs: ['get-image-tag', 'docker-ci-tools']
     runs-on: ubuntu-latest
     env:

diff --git 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-e87b8d4
+TOOLS_IMAGE_TAG ?= main-d02611a
 
 GOTOOLS ?= $(shell cd $(TOOL_DIR) && go list -e -f '{{ .Imports }}' -tags tools |tr -d '[]')