From 38b8d2fd5297c0ef2fbc210d7a9abd5c4b5335e0 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <jakob.ackermann@overleaf.com>
Date: Thu, 24 Jul 2025 10:10:27 +0200
Subject: [PATCH] [monorepo] ensure DOCKER_USER is set and used on all cypress
 containers (#27346)

* [monorepo] ensure DOCKER_USER is set and used on all cypress containers

* [server-ce] test: deduplicate cypress container config

GitOrigin-RevId: ca569a6c95574df7fb29c99577c18f22cdfb83d8
---
 server-ce/test/Makefile           |  1 +
 server-ce/test/docker-compose.yml | 17 +++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile
index 155878d03f..52bf123d1e 100644
--- a/server-ce/test/Makefile
+++ b/server-ce/test/Makefile
@@ -11,6 +11,7 @@ export ALL_TEX_LIVE_DOCKER_IMAGES ?= us-east1-docker.pkg.dev/overleaf-ops/ol-doc
 export IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:latest
 export CYPRESS_SHARD ?=
 export COMPOSE_PROJECT_NAME ?= test
+export DOCKER_USER := $(shell id -u):$(shell id -g)
 
 test-e2e-native:
 	docker compose -f docker-compose.yml -f docker-compose.native.yml up --no-log-prefix sharelatex host-admin -d
diff --git a/server-ce/test/docker-compose.yml b/server-ce/test/docker-compose.yml
index 1652baeae9..56d57d0fe6 100644
--- a/server-ce/test/docker-compose.yml
+++ b/server-ce/test/docker-compose.yml
@@ -72,6 +72,7 @@ services:
     working_dir: /e2e
     volumes:
       - ./:/e2e
+    user: "${DOCKER_USER:-1000:1000}"
     environment:
       CYPRESS_SHARD:
       CYPRESS_BASE_URL: http://sharelatex
@@ -83,26 +84,14 @@ services:
         condition: service_healthy
 
   e2e-open:
-    image: cypress/included:13.13.2
-    stop_grace_period: 0s
-    entrypoint: npm
+    extends:
+      service: e2e
     command: run cypress:open
-    working_dir: /e2e
     volumes:
-      - ./:/e2e
       - /tmp/.X11-unix:/tmp/.X11-unix
       - ${XAUTHORITY:-/dev/null}:/home/node/.Xauthority
-    user: "${DOCKER_USER:-1000:1000}"
     environment:
-      CYPRESS_SHARD:
-      CYPRESS_BASE_URL: http://sharelatex
-      SPEC_PATTERN: '**/*.spec.{js,jsx,ts,tsx}'
       DISPLAY: ${DISPLAY:-:0}
-    depends_on:
-      sharelatex:
-        condition: service_healthy
-      host-admin:
-        condition: service_healthy
 
   host-admin:
     build: .