use uuid to invalidate cache

crazy-max · crazy-max · commit 663f01b9cc77 · 2022-01-13T13:47:43.000+01:00
Signed-off-by: CrazyMax &lt;crazy-max@users.noreply.github.com&gt;
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -90,16 +90,12 @@ target "update-vendor" {
     output = ["."]
 }
 
-// Used to invalidate cache for mod-outdated run stage
-// See also https://github.com/moby/buildkit/issues/1213
-variable "TIMESTAMP" {
-    default = ""
-}
 target "mod-outdated" {
     dockerfile = "./dockerfiles/Dockerfile.vendor"
     target = "outdated"
     args = {
-        TIMESTAMP = TIMESTAMP
+        // used to invalidate cache (more info https://github.com/moby/buildkit/issues/1213)
+        UUID = uuidv4()
     }
     output = ["type=cacheonly"]
 }
diff --git a/docker.Makefile b/docker.Makefile
@@ -20,7 +20,6 @@ ifeq ($(DOCKER_CLI_GO_BUILD_CACHE),y)
 DOCKER_CLI_MOUNTS += -v "$(CACHE_VOLUME_NAME):/root/.cache/go-build"
 endif
 VERSION = $(shell cat VERSION)
-TIMESTAMP = $(shell date '+%s')
 ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS -e GOOS -e GOARCH -e GOARM -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION)
 
 # Some Dockerfiles use features that are only supported with BuildKit enabled
@@ -94,7 +93,7 @@ validate-vendor: ## validate vendor
 
 .PHONY: mod-outdated
 mod-outdated: ## check outdated dependencies
-	TIMESTAMP=$(TIMESTAMP) docker buildx bake mod-outdated
+	docker buildx bake mod-outdated
 
 .PHONY: authors
 authors: ## generate AUTHORS file from git history
diff --git a/dockerfiles/Dockerfile.vendor b/dockerfiles/Dockerfile.vendor
@@ -34,7 +34,7 @@ EOT
 
 FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated
 FROM base AS outdated
-ARG TIMESTAMP
+ARG UUID
 RUN --mount=target=.,rw \
     --mount=target=/go/pkg/mod,type=cache \
     --mount=from=go-mod-outdated,source=/home/go-mod-outdated,target=/usr/bin/go-mod-outdated \

Original file line number	Diff line number	Diff line change
`@@ -90,16 +90,12 @@ target "update-vendor" {`
`90`	`90`	`output = ["."]`
`91`	`91`	`}`
`92`	`92`
`93`		`-// Used to invalidate cache for mod-outdated run stage`
`94`		`-// See also https://github.com/moby/buildkit/issues/1213`
`95`		`-variable "TIMESTAMP" {`
`96`		`- default = ""`
`97`		`-}`
`98`	`93`	`target "mod-outdated" {`
`99`	`94`	`dockerfile = "./dockerfiles/Dockerfile.vendor"`
`100`	`95`	`target = "outdated"`
`101`	`96`	`args = {`
`102`		`- TIMESTAMP = TIMESTAMP`
	`97`	`+ // used to invalidate cache (more info https://github.com/moby/buildkit/issues/1213)`
	`98`	`+ UUID = uuidv4()`
`103`	`99`	`}`
`104`	`100`	`output = ["type=cacheonly"]`
`105`	`101`	`}`