draft

Elastic-Suite · Jan 28, 2025 · f398382 · f398382
1 parent 73633e8
commit f398382
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/compose.ci.yml b/compose.ci.yml
@@ -1,5 +1,3 @@
-include:
-  - compose.e2e.yml
 services:
 
   certbot:
@@ -32,4 +30,11 @@ services:
       context: ./docker/front
       target: gally_example_ci
       additional_contexts:
-        front_src: ./front
+        front_src: ./front
+
+  e2e:
+    extends:
+      file: ./compose.e2e.yml
+      service: e2e
+    environment:
+      - CI=true
diff --git a/compose.e2e.yml b/compose.e2e.yml
@@ -11,5 +11,3 @@ services:
       - proxy
     extra_hosts:
       - ${E2E_SERVER_NAME:-gally.e2e}:host-gateway
-    volumes:
-      - ./front/e2e/:/usr/src/app:rw,cached,z
diff --git a/compose.override.yml b/compose.override.yml
@@ -1,6 +1,4 @@
 # Development environment override
-include:
-  - compose.e2e.yml
 services:
 
   certbot:
@@ -62,3 +60,10 @@ services:
     environment:
       - PUBLIC_URL=https://${SERVER_NAME:-gally.localhost}/example
       - REACT_APP_API_URL=https://${SERVER_NAME:-gally.localhost}/${API_ROUTE_PREFIX:-api}
+
+  e2e:
+    extends:
+      file: ./compose.e2e.yml
+      service: e2e
+    volumes:
+      - ./front/e2e/:/usr/src/app:rw,cached,z
diff --git a/docker/front/Dockerfile.e2e b/docker/front/Dockerfile.e2e
@@ -4,11 +4,9 @@ WORKDIR /usr/src/app
 
 COPY ./front/e2e/ .
 
-RUN yarn install
+RUN yarn install --frozen-lockfile
 
-RUN npx playwright install chromium 
+RUN npx playwright install chromium
 RUN npx playwright install-deps chromium
 
-# CMD ["yarn", "test"]
-# CMD ["tail", "-f", "/dev/null"]
-CMD ["sleep", "infinity"]
+CMD ["sleep", "infinity"]