From a18c8cde3983bd56439dcc643a06cd4d261bf072 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Wed, 15 Oct 2025 11:23:44 +0200
Subject: [PATCH] feat(odoo): support git-aggregator and rename ENVIRONMENT to
 RUNNING_ENV

---
 CHANGELOG.md                     |  2 --
 images/odoo/CHANGELOG.md         | 14 ++++++++++++++
 images/odoo/README.md            |  4 ++--
 images/odoo/bin/template-odoo-rc |  2 +-
 images/odoo/odoo.conf.template   |  3 +--
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 images/odoo/CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ae73a93..d0cf6616 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,10 @@ All notable changes to this project will be documented in this file. The format
 ### Added
 
 * Added OCA maintainer toools repo.
-* Support `git-aggregator`.
 
 ### Updated
 
 * Grouped the help table entries.
-* Prefix Odoo image entrypoint echos.
 
 ## 2025-09-12
 
diff --git a/images/odoo/CHANGELOG.md b/images/odoo/CHANGELOG.md
new file mode 100644
index 00000000..b31d98d9
--- /dev/null
+++ b/images/odoo/CHANGELOG.md
@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+## Undefined
+
+### Added
+
+* Support `git-aggregator`.
+
+### Updated
+
+* Prefix Odoo image entrypoint echos.
+* BREAKING: Renamed `ENVIRONMENT` to `RUNNING_ENV`.
diff --git a/images/odoo/README.md b/images/odoo/README.md
index 8de13574..a6fd21c4 100644
--- a/images/odoo/README.md
+++ b/images/odoo/README.md
@@ -126,7 +126,7 @@ services:
       ODOO_INIT_PASSWORD: *****
       ODOO_INIT_LANG: de_CH
       ODOO_INIT_ADDONS: server_environment_ir_config_parameter
-      ENVIRONMENT: production
+      RUNNING_ENV: production
       PYTHON_INSTALL: prometheus-client
       SERVER_WIDE_MODULES: session_db,module_change_auto_install
       SESSION_DB_URI: postgres://odoo:odoo@db/16.0
@@ -381,7 +381,7 @@ Set these environment variables for the database init:
 
 The Odoo server can be configured using these env vars:
 
-* `ENVIRONMENT` Provide an environment name. Can be accessed with `config.get("environment")`.
+* `RUNNING_ENV` Provide an environment name. Can be accessed with `config.get("environment")`.
 * `PYTHON_INSTALL` Comma seperated list of python packages.
 * `SERVER_WIDE_MODULES` Comma separated list of modules to load with server. The variable will be prefixed with `base,web`.
 * `SESSION_DB_URI` Connection string for storing session data in database.
diff --git a/images/odoo/bin/template-odoo-rc b/images/odoo/bin/template-odoo-rc
index a94b456c..4477d2dc 100755
--- a/images/odoo/bin/template-odoo-rc
+++ b/images/odoo/bin/template-odoo-rc
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export ENVIRONMENT=${ENVIRONMENT:="development"}
+export RUNNING_ENV=${RUNNING_ENV:="development"}
 export SERVER_WIDE_MODULES="base,web,$SERVER_WIDE_MODULES"
 export PROXY_MODE=${PROXY_MODE:=False}
 export LOG_LEVEL=${LOG_LEVEL:="info"}
diff --git a/images/odoo/odoo.conf.template b/images/odoo/odoo.conf.template
index 67bd2fa3..f59daaa4 100644
--- a/images/odoo/odoo.conf.template
+++ b/images/odoo/odoo.conf.template
@@ -1,8 +1,7 @@
 [options]
 data_dir = /var/lib/odoo
 addons_path = $ADDONS_PATH
-environment = $ENVIRONMENT
-running_env = $ENVIRONMENT
+running_env = $RUNNING_ENV
 server_wide_modules = $SERVER_WIDE_MODULES
 proxy_mode = $PROXY_MODE
 log_level = $LOG_LEVEL