From ab9d4e462a6b69a7dfdaf82c73a9c10e5103fd2c Mon Sep 17 00:00:00 2001
From: Nathan Vasse <nathan.vasse@gmail.com>
Date: Wed, 25 Feb 2026 10:51:07 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7(ci)=20allow=20env=20override=20in?=
 =?UTF-8?q?=20compose=20for=20e2e=20tests?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add an ENV_OVERRIDE variable so docker-compose can load an
extra env file (e.g. common.e2e) on top of common.local.
This lets the e2e runner enable WOPI_CLIENTS=collabora
without touching the default dev config.
---
 compose.yaml                 | 1 +
 env.d/development/common.e2e | 1 +
 2 files changed, 2 insertions(+)

diff --git a/compose.yaml b/compose.yaml
index 1453ca3b..2bc560a7 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -123,6 +123,7 @@ services:
     env_file:
       - env.d/development/common
       - env.d/development/common.local
+      - env.d/development/common.${ENV_OVERRIDE:-local}
       - env.d/development/postgresql
       - env.d/development/postgresql.local
     volumes:
diff --git a/env.d/development/common.e2e b/env.d/development/common.e2e
index 35d0b92c..0c9e0323 100644
--- a/env.d/development/common.e2e
+++ b/env.d/development/common.e2e
@@ -1 +1,2 @@
 FRONTEND_RELEASE_NOTE_ENABLED=False
+WOPI_CLIENTS="collabora"