From 501e0a005ce49fae7ee97131418145cc720f7c3f Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 15 Dec 2023 10:26:35 +0100
Subject: [PATCH] lint: set proper cache key for golangci-lint target

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 docker-bake.hcl                  | 1 +
 hack/dockerfiles/lint.Dockerfile | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 1759142bef44..4c4b3e60b5ea 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -122,6 +122,7 @@ target "lint" {
   output = ["type=cacheonly"]
   target = buildtags.target
   args = {
+    TARGETNAME = buildtags.name
     BUILDTAGS = buildtags.tags
   }
   platforms = buildtags.target == "golangci-lint" && GOLANGCI_LINT_MULTIPLATFORM != null ? [
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
index 82f175eb9ee5..142010222b1f 100644
--- a/hack/dockerfiles/lint.Dockerfile
+++ b/hack/dockerfiles/lint.Dockerfile
@@ -19,10 +19,11 @@ COPY --link --from=xx / /
 WORKDIR /go/src/github.com/moby/buildkit
 
 FROM base as golangci-lint
+ARG TARGETNAME
 ARG BUILDTAGS
 ARG TARGETPLATFORM
 RUN --mount=target=/go/src/github.com/moby/buildkit \
-    --mount=target=/root/.cache,type=cache,id=lint-cache-$TARGETPLATFORM \
+    --mount=target=/root/.cache,type=cache,id=lint-cache-${TARGETNAME}-${TARGETPLATFORM} \
   xx-go --wrap && \
   golangci-lint run --build-tags "${BUILDTAGS}" && \
   touch /golangci-lint.done