From 7ca70eb563d6d418369559afe39d9b2eb6eacf92 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Wed, 6 Aug 2025 09:13:23 +0100 Subject: [PATCH] Merge pull request #27652 from overleaf/jpa-latest-to-main [server-pro] run-e2e-tests: tag local images as "main" GitOrigin-RevId: b32522bd278a44a551898cab32b8a698b04ab8a6 --- server-ce/test/Makefile | 3 ++- server-ce/test/docker-compose.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile index 1c318ba0cc..f580ba5f69 100644 --- a/server-ce/test/Makefile +++ b/server-ce/test/Makefile @@ -8,7 +8,8 @@ export PWD = $(shell pwd) export TEX_LIVE_DOCKER_IMAGE ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/texlive-full:2023.1 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_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:latest +export IMAGE_TAG_CE ?= sharelatex/sharelatex:main +export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:main export CYPRESS_SHARD ?= export COMPOSE_PROJECT_NAME ?= test export DOCKER_USER := $(shell id -u):$(shell id -g) diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml index 00ab290d68..4c8b240339 100644 --- a/server-ce/test/docker-compose.yml +++ b/server-ce/test/docker-compose.yml @@ -108,8 +108,8 @@ services: COMPOSE_PROJECT_NAME: TEX_LIVE_DOCKER_IMAGE: ALL_TEX_LIVE_DOCKER_IMAGES: - IMAGE_TAG_CE: ${IMAGE_TAG_CE:-sharelatex/sharelatex:latest} - IMAGE_TAG_PRO: ${IMAGE_TAG_PRO:-quay.io/sharelatex/sharelatex-pro:latest} + IMAGE_TAG_CE: + IMAGE_TAG_PRO: healthcheck: test: curl --fail http://localhost/status interval: 3s