Răsfoiți Sursa

[web] use tmpfs for transferring /overleaf into cypress image (#23529)

GitOrigin-RevId: e913a4388be6feb6e0cddd098f64452bfa0e7ef7
Jakob Ackermann 1 an în urmă
părinte
comite
4983e760bb

+ 0 - 9
services/web/Dockerfile.frontend_ct

@@ -1,9 +0,0 @@
-ARG PROJECT_NAME
-ARG BRANCH_NAME
-ARG BUILD_NUMBER
-ARG CYPRESS_IMAGE
-
-FROM ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER AS dev
-
-FROM $CYPRESS_IMAGE
-COPY --from=dev /overleaf /overleaf

+ 2 - 3
services/web/Makefile

@@ -135,9 +135,8 @@ TEST_FRONTEND_CT_VARIANTS = \
 	test_frontend_ct_editor \
 
 # Note: The below cypress targets are for CI only
-build_test_frontend_ct: $(TEST_FRONTEND_CT_VARIANTS:=/build)
-$(TEST_FRONTEND_CT_VARIANTS:=/build): %/build:
-	COMPOSE_PROJECT_NAME=$*_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) build test_frontend_ct
+build_test_frontend_ct:
+	docker run --rm --volume /dev/shm:/dev/shm --user root $(IMAGE_CI) bash -ec 'tar -cC / overleaf | tar -xC /dev/shm'
 
 test_frontend_ct_core: export CYPRESS_RESULTS=./cypress/results/core
 test_frontend_ct_core: export CYPRESS_SPEC_PATTERN=./test/frontend/**/*.spec.{js,jsx,ts,tsx}

+ 2 - 8
services/web/docker-compose.ci.yml

@@ -54,14 +54,7 @@ services:
       NODE_OPTIONS: "--unhandled-rejections=strict"
 
   test_frontend_ct:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.frontend_ct
-      args:
-        PROJECT_NAME: $PROJECT_NAME
-        BRANCH_NAME: $BRANCH_NAME
-        BUILD_NUMBER: $BUILD_NUMBER
-        CYPRESS_IMAGE: $CYPRESS_IMAGE
+    image: $CYPRESS_IMAGE
     working_dir: /overleaf/services/web
     entrypoint: bash
     environment:
@@ -69,6 +62,7 @@ services:
       CYPRESS_EXCLUDE_SPEC_PATTERN: ${CYPRESS_EXCLUDE_SPEC_PATTERN:-}
     volumes:
       - ${CYPRESS_RESULTS:-./cypress/results}:/overleaf/services/web/cypress/results/
+      - /dev/shm/overleaf:/overleaf
     command:
       - "-c"
       - "if npm run cypress:run-ct; then exit 0; else mkdir -p ./cypress/results && touch ./cypress/results/.cypress_fail; fi;"