From 718fc9a5ddb8d06f4a7e90fa590b42264a47c7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 30 Nov 2024 14:14:01 +0100 Subject: [PATCH 1/2] Tweak README --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 731f8bc..f498b70 100644 --- a/README.md +++ b/README.md @@ -8,17 +8,13 @@ a derived image that adds your Odoo and addons. This image does not mandate any particular installation method for Odoo and addons, nor does it impose any constraint on your project structure. -
- -
- ## Available image tags The CI of this project builds regularly for some combinations of Odoo version, python version and Ubuntu version. -The supported combinations are visible in the \[build -matrix\](./.github/workflows/ci.yml). +The supported combinations are visible in the [build +matrix](./.github/workflows/ci.yml). ## Features exposed by these images @@ -115,7 +111,7 @@ inspiration. Assume you have your custom addons in `myaddons`. You can create the following Dockerfile: -``` dockerfile +```dockerfile ARG odoo_version=17.0 ########################################################################### From 916999526d4250fb1a69fb5c10e7fc8950c3945a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Sat, 30 Nov 2024 14:18:46 +0100 Subject: [PATCH 2/2] Improve environment variables documentation --- README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f498b70..9ae23f7 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,10 @@ For more details, read [./bin/entrypoint.sh](./bin/entrypoint.sh). ### Configuration The following environment variables are used to generate the Odoo -configuration file in `$ODOO_RC`: +configuration file in `$ODOO_RC`. + +Odoo options: -- `ADDITIONAL_ODOO_RC` - `ADDONS_PATH` - `ADMIN_PASSWD` - `DB_FILTER` @@ -89,13 +90,18 @@ configuration file in `$ODOO_RC`: - `LOG_LEVEL` - `LOGFILE` - `MAX_CRON_THREADS` -- `RUNNING_ENV` - `SERVER_WIDE_MODULES` (\>=10) - `SYSLOG` - `UNACCENT` - `WITHOUT_DEMO` - `WORKERS` +Other variables that populate `$ODOO_RC`: + +- `RUNNING_ENV`: sets `options.running_env` for use by the [OCA + server_environment](https://github.com/OCA/server-env) module. +- `ADDITIONAL_ODOO_RC`: is appended verbatim a the end of `$ODOO_RC˘. + The following environment variables are processed by the entrypoint, if the psql client is installed (which is not the case by default):