From 161816206fc64e6cc2aa55f646c9bbabe5e20c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Todorovich?= <ivan.todorovich@gmail.com>
Date: Thu, 2 Jan 2025 10:29:03 -0300
Subject: [PATCH] imp: Replace environment variable OPENERP_SERVER with ODOO_RC

It's the officially supported way to point to the config file since Odoo 10.0.
OPENERP_SERVER will be officially deprecated in Odoo 19.0.

See: https://github.com/odoo/odoo/blob/4185fe84/odoo/tools/config.py#L464
---
 12.0/Dockerfile | 2 +-
 13.0/Dockerfile | 2 +-
 14.0/Dockerfile | 2 +-
 15.0/Dockerfile | 2 +-
 16.0/Dockerfile | 2 +-
 17.0/Dockerfile | 2 +-
 18.0/Dockerfile | 2 +-
 HISTORY.rst     | 2 ++
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 7474962a..c91cf4e7 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=12.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index f9363162..06b079a5 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -74,7 +74,7 @@ ENV ODOO_VERSION=13.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/14.0/Dockerfile b/14.0/Dockerfile
index 1707a556..76582d2c 100644
--- a/14.0/Dockerfile
+++ b/14.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=14.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/local-src,/odoo/src/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index ab485f0d..22a21792 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=15.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/16.0/Dockerfile b/16.0/Dockerfile
index 6d2c80a7..fee84c1c 100644
--- a/16.0/Dockerfile
+++ b/16.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=16.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/17.0/Dockerfile b/17.0/Dockerfile
index b8474a09..f497c829 100644
--- a/17.0/Dockerfile
+++ b/17.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=17.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/18.0/Dockerfile b/18.0/Dockerfile
index 8fda6780..61b372cc 100644
--- a/18.0/Dockerfile
+++ b/18.0/Dockerfile
@@ -75,7 +75,7 @@ ENV ODOO_VERSION=18.0 \
     ODOO_DATA_PATH=/odoo/data \
     DEMO=False \
     ADDONS_PATH=/odoo/odoo/addons,/odoo/odoo/src/odoo/addons \
-    OPENERP_SERVER=/odoo/odoo.cfg
+    ODOO_RC=/odoo/odoo.cfg
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["odoo"]
diff --git a/HISTORY.rst b/HISTORY.rst
index a10c93d6..3ec79827 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@
 
 .. **Features and Improvements**
 
+* Replace environment variable OPENERP_SERVER with ODOO_RC
+
 .. **Bugfixes**
 
 .. **Libraries**