[monorepo] compute IMAGE_CACHE lazily (#29087)

GitOrigin-RevId: de287c89c1cea858d0609265945266be19d7ea26
This commit is contained in:
Jakob Ackermann
2025-10-15 09:47:42 +02:00
committed by Copybot
parent ce38ba6fc1
commit 0182ad0046
11 changed files with 11 additions and 11 deletions

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -11,7 +11,7 @@ export MONOREPO ?= $(shell cd ../../ && pwd)
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):$(BRANCH_NAME)-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/fetch-utils/package.json \ $(MONOREPO)/libraries/fetch-utils/package.json \

View File

@@ -547,7 +547,7 @@ shellcheck_fix:
IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) IMAGE_CI ?= ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME) IMAGE_REPO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME)
IMAGE_REPO_FINAL ?= $(IMAGE_REPO):main-$(BUILD_NUMBER) IMAGE_REPO_FINAL ?= $(IMAGE_REPO):main-$(BUILD_NUMBER)
export IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \ IMAGE_CACHE ?= $(IMAGE_REPO):cache-$(shell cat \
$(MONOREPO)/package.json \ $(MONOREPO)/package.json \
$(MONOREPO)/package-lock.json \ $(MONOREPO)/package-lock.json \
$(MONOREPO)/libraries/access-token-encryptor/package.json \ $(MONOREPO)/libraries/access-token-encryptor/package.json \