From 292e9efbb7a465b6681d22b807e6d445124b200d Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Wed, 8 Nov 2023 13:41:20 +0000 Subject: [PATCH] Merge pull request #15666 from overleaf/csh-issue-15655-artifact-registry Dual push chat for artefact registry GitOrigin-RevId: d14f3c7631b4eb69dff44454fa2e6086f7311ab6 --- services/chat/Makefile | 2 ++ services/chat/buildscript.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/services/chat/Makefile b/services/chat/Makefile index 84ad3e4aed..31d5c9b38f 100644 --- a/services/chat/Makefile +++ b/services/chat/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/chat/buildscript.txt b/services/chat/buildscript.txt index a8ee47b829..4e50f224df 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -1,6 +1,6 @@ chat --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