[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
This commit is contained in:
Jakob Ackermann
2025-07-25 08:04:53 +00:00
committed by Copybot
parent 95f51c4d46
commit f764098bd6
2 changed files with 4 additions and 14 deletions
+1
View File
@@ -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 IMAGE_TAG_PRO ?= us-east1-docker.pkg.dev/overleaf-ops/ol-docker/pro:latest
export CYPRESS_SHARD ?= export CYPRESS_SHARD ?=
export COMPOSE_PROJECT_NAME ?= test export COMPOSE_PROJECT_NAME ?= test
export DOCKER_USER := $(shell id -u):$(shell id -g)
test-e2e-native: test-e2e-native:
docker compose -f docker-compose.yml -f docker-compose.native.yml up --no-log-prefix sharelatex host-admin -d docker compose -f docker-compose.yml -f docker-compose.native.yml up --no-log-prefix sharelatex host-admin -d
+3 -14
View File
@@ -72,6 +72,7 @@ services:
working_dir: /e2e working_dir: /e2e
volumes: volumes:
- ./:/e2e - ./:/e2e
user: "${DOCKER_USER:-1000:1000}"
environment: environment:
CYPRESS_SHARD: CYPRESS_SHARD:
CYPRESS_BASE_URL: http://sharelatex CYPRESS_BASE_URL: http://sharelatex
@@ -83,26 +84,14 @@ services:
condition: service_healthy condition: service_healthy
e2e-open: e2e-open:
image: cypress/included:13.13.2 extends:
stop_grace_period: 0s service: e2e
entrypoint: npm
command: run cypress:open command: run cypress:open
working_dir: /e2e
volumes: volumes:
- ./:/e2e
- /tmp/.X11-unix:/tmp/.X11-unix - /tmp/.X11-unix:/tmp/.X11-unix
- ${XAUTHORITY:-/dev/null}:/home/node/.Xauthority - ${XAUTHORITY:-/dev/null}:/home/node/.Xauthority
user: "${DOCKER_USER:-1000:1000}"
environment: environment:
CYPRESS_SHARD:
CYPRESS_BASE_URL: http://sharelatex
SPEC_PATTERN: '**/*.spec.{js,jsx,ts,tsx}'
DISPLAY: ${DISPLAY:-:0} DISPLAY: ${DISPLAY:-:0}
depends_on:
sharelatex:
condition: service_healthy
host-admin:
condition: service_healthy
host-admin: host-admin:
build: . build: .