mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-05-23 17:19:37 +02:00
[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:
@@ -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
|
||||
|
||||
@@ -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: .
|
||||
|
||||
Reference in New Issue
Block a user