From ec84a88eb34c02e5e2d87e08eb7795d652d0dad8 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 2 Jun 2026 09:16:40 +0200 Subject: [PATCH] [server-ce] tests: build git-bridge latest locally in CI (#34177) GitOrigin-RevId: 78bf654eee77a62185a53b1abdf2cd9ae0662802 --- server-ce/test/Makefile | 1 + server-ce/test/docker-compose.yml | 13 +++++++------ server-ce/test/host-admin.js | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile index cf3582e377..367059ef04 100644 --- a/server-ce/test/Makefile +++ b/server-ce/test/Makefile @@ -11,6 +11,7 @@ export TEX_LIVE_DOCKER_IMAGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/t export ALL_TEX_LIVE_DOCKER_IMAGES ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1,us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2022.1 export IMAGE_TAG_CE ?= sharelatex/sharelatex:main export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:main +export IMAGE_TAG_GIT_BRIDGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/git-bridge:main export CYPRESS_SHARD ?= export COMPOSE_PROJECT_NAME ?= test export USER_UID=$(shell id -u) diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml index 6d26e31f00..056b7c73de 100644 --- a/server-ce/test/docker-compose.yml +++ b/server-ce/test/docker-compose.yml @@ -78,12 +78,12 @@ services: working_dir: $PWD volumes: - $PWD:$PWD - - $MONOREPO/libraries:$MONOREPO/libraries:ro - - $MONOREPO/node_modules:$MONOREPO/node_modules:ro - - $MONOREPO/.yarn:$MONOREPO/.yarn:ro - - $MONOREPO/.yarnrc.yml:$MONOREPO/.yarnrc.yml:ro - - $MONOREPO/package.json:$MONOREPO/package.json:ro - - $MONOREPO/yarn.lock:$MONOREPO/yarn.lock:ro + - $MONOREPO/libraries:$MONOREPO/libraries + - $MONOREPO/node_modules:$MONOREPO/node_modules + - $MONOREPO/.yarn:$MONOREPO/.yarn + - $MONOREPO/.yarnrc.yml:$MONOREPO/.yarnrc.yml + - $MONOREPO/package.json:$MONOREPO/package.json + - $MONOREPO/yarn.lock:$MONOREPO/yarn.lock environment: MONOREPO: CYPRESS_SHARD: @@ -130,6 +130,7 @@ services: ALL_TEX_LIVE_DOCKER_IMAGES: IMAGE_TAG_CE: IMAGE_TAG_PRO: + IMAGE_TAG_GIT_BRIDGE: healthcheck: test: curl --fail http://localhost/status interval: 3s diff --git a/server-ce/test/host-admin.js b/server-ce/test/host-admin.js index a56cb218a1..6cceae4b2c 100644 --- a/server-ce/test/host-admin.js +++ b/server-ce/test/host-admin.js @@ -32,11 +32,12 @@ const PATHS = { const IMAGES = { CE: process.env.IMAGE_TAG_CE.replace(/:.+/, ''), PRO: process.env.IMAGE_TAG_PRO.replace(/:.+/, ''), + GIT_BRIDGE: process.env.IMAGE_TAG_GIT_BRIDGE.replace(/:.+/, ''), } const LATEST = { CE: process.env.IMAGE_TAG_CE.replace(/.+:/, '') || 'latest', PRO: process.env.IMAGE_TAG_PRO.replace(/.+:/, '') || 'latest', - GIT_BRIDGE: 'latest', // TODO, build in CI? + GIT_BRIDGE: process.env.IMAGE_TAG_GIT_BRIDGE.replace(/.+:/, '') || 'latest', } function defaultDockerComposeOverride() { @@ -242,7 +243,7 @@ function setVarsDockerCompose({ cfg.services.sharelatex.image = `${pro ? IMAGES.PRO : IMAGES.CE}:${version === 'latest' ? (pro ? LATEST.PRO : LATEST.CE) : version}` cfg.services['git-bridge'].image = - `quay.io/sharelatex/git-bridge:${version === 'latest' ? LATEST.GIT_BRIDGE : version}` + `${IMAGES.GIT_BRIDGE}:${version === 'latest' ? LATEST.GIT_BRIDGE : version}` cfg.services.sharelatex.environment = vars