From 729cbf3fce9a3d24740dc268dd74937565d2f869 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 5 Jan 2022 10:58:48 +0000 Subject: [PATCH] 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 --- libraries/access-token-encryptor/buildscript.txt | 2 +- libraries/logger/buildscript.txt | 2 +- libraries/metrics/buildscript.txt | 2 +- libraries/o-error/buildscript.txt | 2 +- libraries/object-persistor/buildscript.txt | 2 +- libraries/redis-wrapper/buildscript.txt | 2 +- libraries/settings/buildscript.txt | 2 +- services/chat/buildscript.txt | 2 +- services/clsi/Makefile | 13 +++++++++++++ services/clsi/buildscript.txt | 2 +- services/contacts/buildscript.txt | 2 +- services/docstore/buildscript.txt | 2 +- services/document-updater/buildscript.txt | 2 +- services/filestore/Makefile | 13 +++++++++++++ services/filestore/buildscript.txt | 2 +- services/notifications/buildscript.txt | 2 +- services/real-time/buildscript.txt | 2 +- services/spelling/Makefile | 13 +++++++++++++ services/spelling/buildscript.txt | 2 +- services/track-changes/buildscript.txt | 2 +- 20 files changed, 56 insertions(+), 17 deletions(-) diff --git a/libraries/access-token-encryptor/buildscript.txt b/libraries/access-token-encryptor/buildscript.txt index 97826bad0e..764860cd76 100644 --- 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 diff --git a/libraries/logger/buildscript.txt b/libraries/logger/buildscript.txt index 8737b651a4..34a5e01bc1 100644 --- 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 diff --git a/libraries/metrics/buildscript.txt b/libraries/metrics/buildscript.txt index f6d28b010d..8918aa1f8d 100644 --- 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 diff --git a/libraries/o-error/buildscript.txt b/libraries/o-error/buildscript.txt index f3a704344c..f08dbc2b9d 100644 --- 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 diff --git a/libraries/object-persistor/buildscript.txt b/libraries/object-persistor/buildscript.txt index 0f393c6452..e1588dc2ea 100644 --- 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 diff --git a/libraries/redis-wrapper/buildscript.txt b/libraries/redis-wrapper/buildscript.txt index f9c10278f8..8c90edb0ec 100644 --- 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 diff --git a/libraries/settings/buildscript.txt b/libraries/settings/buildscript.txt index 4a931ab868..d0bb91795a 100644 --- 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 diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index 583197e6c4..d9dd0cac2a 100644 --- 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 diff --git a/services/clsi/Makefile b/services/clsi/Makefile index a4800bc573..d71d353379 100644 --- 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: diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index bce772aa35..2401f81395 100644 --- 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 diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index 8e203ef9c4..5b3c96371b 100644 --- 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 diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index dedbd2b208..7e7baa4fd8 100644 --- 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 diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index f19db09739..186e89cf28 100644 --- 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 diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 4eca214cac..fb666c0f8b 100644 --- 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: diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 627768fc2a..9c61c56f75 100644 --- 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 diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 754ef8aeb4..9c80e1cea4 100644 --- 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 diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 8f716697bc..12382f8e37 100644 --- 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 diff --git a/services/spelling/Makefile b/services/spelling/Makefile index 2d0d8bd082..db078814e3 100644 --- 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: diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index d4b4700cfd..1e900b877a 100644 --- 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 diff --git a/services/track-changes/buildscript.txt b/services/track-changes/buildscript.txt index 19a11be8a0..978febd83e 100644 --- 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