Merge pull request #6224 from overleaf/jpa-cache-install-deps

[misc] add docker image caching for install_deps, pre-fetch node image GitOrigin-RevId: b52e52351c62b780538e0668b99fc1c28723addc
2026-05-30 20:31:34 +02:00 · 2022-01-05 10:58:48 +00:00
parent 9acf86745f
commit 4e8f6fef2a
20 changed files with 56 additions and 17 deletions
--- a/libraries/access-token-encryptor/buildscript.txt
+++ b/libraries/access-token-encryptor/buildscript.txt
@@ -6,4 +6,4 @@ access-token-encryptor
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/logger/buildscript.txt
+++ b/libraries/logger/buildscript.txt
@@ -6,4 +6,4 @@ logger
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/metrics/buildscript.txt
+++ b/libraries/metrics/buildscript.txt
@@ -6,4 +6,4 @@ metrics
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/o-error/buildscript.txt
+++ b/libraries/o-error/buildscript.txt
@@ -6,4 +6,4 @@ o-error
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/object-persistor/buildscript.txt
+++ b/libraries/object-persistor/buildscript.txt
@@ -6,4 +6,4 @@ object-persistor
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/redis-wrapper/buildscript.txt
+++ b/libraries/redis-wrapper/buildscript.txt
@@ -6,4 +6,4 @@ redis-wrapper
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/libraries/settings/buildscript.txt
+++ b/libraries/settings/buildscript.txt
@@ -6,4 +6,4 @@ settings
 --is-library=True
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/chat/buildscript.txt
+++ b/services/chat/buildscript.txt
@@ -5,4 +5,4 @@ chat
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/clsi/Makefile
+++ b/services/clsi/Makefile
@@ -84,8 +84,21 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 endif

 build:
+	docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		|| docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		|| echo 'nothing cached'
+	docker build \
+	 	--pull \
+		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		--target base \
+		--file Dockerfile \
+		.
+
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
 		.

 tar:
--- a/services/clsi/buildscript.txt
+++ b/services/clsi/buildscript.txt
@@ -7,4 +7,4 @@ clsi
 --has-custom-cloudbuild=True
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/contacts/buildscript.txt
+++ b/services/contacts/buildscript.txt
@@ -5,4 +5,4 @@ contacts
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/docstore/buildscript.txt
+++ b/services/docstore/buildscript.txt
@@ -5,4 +5,4 @@ docstore
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/document-updater/buildscript.txt
+++ b/services/document-updater/buildscript.txt
@@ -5,4 +5,4 @@ document-updater
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/filestore/Makefile
+++ b/services/filestore/Makefile
@@ -84,8 +84,21 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 endif

 build:
+	docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		|| docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		|| echo 'nothing cached'
+	docker build \
+	 	--pull \
+		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		--target base \
+		--file Dockerfile \
+		.
+
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
 		.

 tar:
--- a/services/filestore/buildscript.txt
+++ b/services/filestore/buildscript.txt
@@ -6,4 +6,4 @@ filestore
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/notifications/buildscript.txt
+++ b/services/notifications/buildscript.txt
@@ -5,4 +5,4 @@ notifications
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/real-time/buildscript.txt
+++ b/services/real-time/buildscript.txt
@@ -5,4 +5,4 @@ real-time
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/spelling/Makefile
+++ b/services/spelling/Makefile
@@ -84,8 +84,21 @@ ifneq (,$(wildcard test/acceptance/js/scripts/pre-run))
 endif

 build:
+	docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		|| docker pull gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		|| echo 'nothing cached'
+	docker build \
+	 	--pull \
+		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):main-deps \
+		--target base \
+		--file Dockerfile \
+		.
+
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--cache-from gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-deps \
 		.

 tar:
--- a/services/spelling/buildscript.txt
+++ b/services/spelling/buildscript.txt
@@ -6,4 +6,4 @@ spelling
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=False
--script-version=3.11.0
+--script-version=3.13.0
--- a/services/track-changes/buildscript.txt
+++ b/services/track-changes/buildscript.txt
@@ -5,4 +5,4 @@ track-changes
 --env-pass-through=
 --node-version=14.18.1
 --public-repo=True
--script-version=3.11.0
+--script-version=3.13.0