From be6206845eaca10c1c9239ea60b7d78becdde22b Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 23 Nov 2023 15:04:16 +0000 Subject: [PATCH] Merge pull request #15910 from overleaf/csh-issue-15655-add-apps-to-ar Move buildscript apps over to AR GitOrigin-RevId: d5862b6313d1b0f3d0faef23cc5330c77abc3a3d --- services/clsi/Makefile | 9 +++++++++ services/clsi/buildscript.txt | 2 +- services/contacts/Makefile | 2 ++ services/contacts/buildscript.txt | 2 +- services/docstore/Makefile | 2 ++ services/docstore/buildscript.txt | 2 +- services/document-updater/Makefile | 2 ++ services/document-updater/buildscript.txt | 2 +- services/filestore/Makefile | 9 +++++++++ services/filestore/buildscript.txt | 2 +- services/history-v1/Makefile | 2 ++ services/history-v1/buildscript.txt | 2 +- services/notifications/Makefile | 2 ++ services/notifications/buildscript.txt | 2 +- services/project-history/Makefile | 2 ++ services/project-history/buildscript.txt | 2 +- services/real-time/Makefile | 2 ++ services/real-time/buildscript.txt | 2 +- services/spelling/Makefile | 9 +++++++++ services/spelling/buildscript.txt | 2 +- 20 files changed, 51 insertions(+), 10 deletions(-) diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 876943cecf..bdb9eb5983 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -90,12 +91,18 @@ 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 for gcr.io/overleaf-ops' + docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + || docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ + || echo 'nothing cached for us-east1-docker.pkg.dev/overleaf-ops/ol-docker' docker build \ --pull \ --build-arg BUILDKIT_INLINE_CACHE=1 \ --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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ --target base \ --file Dockerfile \ ../.. @@ -103,6 +110,8 @@ build: 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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ --file Dockerfile \ ../.. diff --git a/services/clsi/buildscript.txt b/services/clsi/buildscript.txt index f8a190546e..09856a8f4b 100644 --- a/services/clsi/buildscript.txt +++ b/services/clsi/buildscript.txt @@ -1,7 +1,7 @@ clsi --data-dirs=cache,compiles,output --dependencies= ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add=ENABLE_PDF_CACHING="true",PDF_CACHING_ENABLE_WORKER_POOL="true" --env-pass-through=TEXLIVE_IMAGE --esmock-loader=False diff --git a/services/contacts/Makefile b/services/contacts/Makefile index 9c18bc6abd..f07edbc72e 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/contacts/buildscript.txt b/services/contacts/buildscript.txt index c8034c0a24..c4ed3cead2 100644 --- a/services/contacts/buildscript.txt +++ b/services/contacts/buildscript.txt @@ -1,6 +1,6 @@ contacts --dependencies=mongo ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=True diff --git a/services/docstore/Makefile b/services/docstore/Makefile index a0cddad278..6e5d3f7409 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/docstore/buildscript.txt b/services/docstore/buildscript.txt index f977eb50ec..9ad2ba5eed 100644 --- a/services/docstore/buildscript.txt +++ b/services/docstore/buildscript.txt @@ -1,6 +1,6 @@ docstore --dependencies=mongo,gcs ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index e18f81c828..045eaa9af8 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/document-updater/buildscript.txt b/services/document-updater/buildscript.txt index bc610c9514..a296eafcbe 100644 --- a/services/document-updater/buildscript.txt +++ b/services/document-updater/buildscript.txt @@ -1,6 +1,6 @@ document-updater --dependencies=mongo,redis ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/filestore/Makefile b/services/filestore/Makefile index af831c4a8d..f6d0b3b852 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -90,12 +91,18 @@ 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 for gcr.io/overleaf-ops' + docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + || docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ + || echo 'nothing cached for us-east1-docker.pkg.dev/overleaf-ops/ol-docker' docker build \ --pull \ --build-arg BUILDKIT_INLINE_CACHE=1 \ --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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ --target base \ --file Dockerfile \ ../.. @@ -103,6 +110,8 @@ build: 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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ --file Dockerfile \ ../.. diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 0d2b0a69c8..a240e963e9 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -1,7 +1,7 @@ filestore --data-dirs=uploads,user_files,template_files --dependencies=s3,gcs ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add=ENABLE_CONVERSIONS="true",USE_PROM_METRICS="true",AWS_S3_USER_FILES_BUCKET_NAME=fake_user_files,AWS_S3_TEMPLATE_FILES_BUCKET_NAME=fake_template_files,AWS_S3_PUBLIC_FILES_BUCKET_NAME=fake_public_files,GCS_USER_FILES_BUCKET_NAME=fake_userfiles,GCS_TEMPLATE_FILES_BUCKET_NAME=fake_templatefiles,GCS_PUBLIC_FILES_BUCKET_NAME=fake_publicfiles --env-pass-through= --esmock-loader=False diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index 191cab45dc..3f72f92d1c 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/history-v1/buildscript.txt b/services/history-v1/buildscript.txt index 7930d3e8dd..c52b676609 100644 --- a/services/history-v1/buildscript.txt +++ b/services/history-v1/buildscript.txt @@ -1,6 +1,6 @@ history-v1 --dependencies=postgres,gcs,mongo ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 13f31c6836..18698c299d 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index 1b1b8a0ffd..e526a98cbb 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -1,6 +1,6 @@ notifications --dependencies=mongo ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/project-history/Makefile b/services/project-history/Makefile index a7063a7027..60f2b8b4e1 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -96,6 +97,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/project-history/buildscript.txt b/services/project-history/buildscript.txt index a2182066b3..b7ce994c47 100644 --- a/services/project-history/buildscript.txt +++ b/services/project-history/buildscript.txt @@ -1,6 +1,6 @@ project-history --dependencies=mongo,redis ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=True diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 893b7f8560..6227cc708f 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -89,6 +90,7 @@ benchmarks: build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --file Dockerfile \ ../.. diff --git a/services/real-time/buildscript.txt b/services/real-time/buildscript.txt index 4169533b2d..1f1f9bca29 100644 --- a/services/real-time/buildscript.txt +++ b/services/real-time/buildscript.txt @@ -1,6 +1,6 @@ real-time --dependencies=redis ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=False diff --git a/services/spelling/Makefile b/services/spelling/Makefile index e344f77321..4adc3106ec 100644 --- a/services/spelling/Makefile +++ b/services/spelling/Makefile @@ -23,6 +23,7 @@ DOCKER_COMPOSE_TEST_UNIT = \ clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -docker rmi gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + -docker rmi us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) -$(DOCKER_COMPOSE_TEST_UNIT) down --rmi local -$(DOCKER_COMPOSE_TEST_ACCEPTANCE) down --rmi local @@ -90,12 +91,18 @@ 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 for gcr.io/overleaf-ops' + docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + || docker pull us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ + || echo 'nothing cached for us-east1-docker.pkg.dev/overleaf-ops/ol-docker' docker build \ --pull \ --build-arg BUILDKIT_INLINE_CACHE=1 \ --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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):main-deps \ --target base \ --file Dockerfile \ ../.. @@ -103,6 +110,8 @@ build: 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 \ + --tag us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ + --cache-from us-east1-docker.pkg.dev/overleaf-ops/ol-docker/$(PROJECT_NAME):$(BRANCH_NAME)-deps \ --file Dockerfile \ ../.. diff --git a/services/spelling/buildscript.txt b/services/spelling/buildscript.txt index ecdba20174..53197b099b 100644 --- a/services/spelling/buildscript.txt +++ b/services/spelling/buildscript.txt @@ -1,7 +1,7 @@ spelling --data-dirs=cache --dependencies= ---docker-repos=gcr.io/overleaf-ops +--docker-repos=gcr.io/overleaf-ops,us-east1-docker.pkg.dev/overleaf-ops/ol-docker --env-add= --env-pass-through= --esmock-loader=True