From 033867958146426fffc407f3050ddb70bca35b2f Mon Sep 17 00:00:00 2001
From: Botis <botis@smile.fr>
Date: Tue, 14 Jan 2025 12:13:53 +0100
Subject: [PATCH] update compose files

---
 compose.e2e.yml      | 13 +++++++++++++
 compose.override.yml | 20 ++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 compose.e2e.yml

diff --git a/compose.e2e.yml b/compose.e2e.yml
new file mode 100644
index 000000000..7f6cbf1d9
--- /dev/null
+++ b/compose.e2e.yml
@@ -0,0 +1,13 @@
+# E2E environment override
+services:
+  e2e:
+    build:
+      context: .
+      dockerfile: ./docker/front/Dockerfile.e2e
+    environment:
+      - SERVER_BASE_URL=https://${E2E_SERVER_NAME:-gally.e2e}
+      - API_SERVER_BASE_URL=https://${E2E_SERVER_NAME:-gally.e2e}/${API_ROUTE_PREFIX:-api}
+    depends_on:
+      - proxy
+    extra_hosts:
+      - ${E2E_SERVER_NAME:-gally.e2e}:host-gateway
diff --git a/compose.override.yml b/compose.override.yml
index 3d918dec4..3fca53ad9 100644
--- a/compose.override.yml
+++ b/compose.override.yml
@@ -1,4 +1,6 @@
 # Development environment override
+include:
+  - compose.e2e.yml
 services:
   
   certbot:
@@ -21,6 +23,7 @@ services:
       - ./docker/php/conf.d/app.dev.ini:/usr/local/etc/php/conf.d/app.dev.ini:ro,z
     environment:
       - APP_ENV=${APP_ENV:-dev}
+      - TRUSTED_HOSTS=${TRUSTED_HOSTS:-^${SERVER_NAME:-|gally.localhost}|localhost|${E2E_SERVER_NAME:-gally.e2e}|php$$}
       # See https://xdebug.org/docs/all_settings#mode
       - XDEBUG_MODE=${XDEBUG_MODE:-off}
       - PHP_IDE_CONFIG=serverName=gally
@@ -41,6 +44,9 @@ services:
     environment:
       # On Linux, you may want to comment the following line for improved performance
       - WATCHPACK_POLLING="true"
+      - NEXT_PUBLIC_ENTRYPOINT
+      - NEXT_PUBLIC_API_URL
+      - REACT_APP_API_URL
 
   example:
     user: ${UUID?You must set UUID env var}:${GUID?You must set GUID env var}
@@ -56,17 +62,3 @@ services:
     environment:
       - PUBLIC_URL=https://${SERVER_NAME:-gally.localhost}/example
       - REACT_APP_API_URL=https://${SERVER_NAME:-gally.localhost}/${API_ROUTE_PREFIX:-api}
-
-  e2e:
-    build:
-      context: .
-      dockerfile: ./docker/front/Dockerfile.e2e
-    environment:
-      - SERVER_BASE_URL=https://${SERVER_NAME:-gally.localhost}
-      - API_SERVER_BASE_URL=https://${API_SERVER_NAME:-api.gally.localhost}
-    depends_on:
-      - proxy
-    extra_hosts:
-      - ${SERVER_NAME:-gally.localhost}:host-gateway
-      - ${API_SERVER_NAME:-api.gally.localhost}:host-gateway
-