diff --git a/docker-compose.yml b/docker-compose.yml index 39ff117..d9aea0d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,7 @@ services: - USER=${DB_USER} - PASSWORD=${DB_PASSWORD} - ODOO_TAG + - ODOO_RC - THIRD_PARTY_ADDONS - ODOO_SESSION_REDIS - ODOO_SESSION_REDIS_HOST diff --git a/odoo/odoorc.sh b/odoo/odoorc.sh index bf2509f..51a2ed4 100755 --- a/odoo/odoorc.sh +++ b/odoo/odoorc.sh @@ -5,9 +5,6 @@ set -e # Define the path to the example configuration file TEMPLATE_CONF="odoo.conf" -# Copy the example conf to the destination to start replacing the variables -cp "$TEMPLATE_CONF" "$ODOO_RC" - # First pass: Evaluate any nested variables within .env file and export them while IFS='=' read -r key value || [[ -n $key ]]; do # Skip comments and empty lines @@ -23,6 +20,9 @@ while IFS='=' read -r key value || [[ -n $key ]]; do export "$key=$value" done < .env +# Copy the example conf to the destination to start replacing the variables +cp "$TEMPLATE_CONF" "$ODOO_RC" + # Second pass: Replace the variables in $ODOO_RC while IFS='=' read -r key value || [[ -n $key ]]; do # Skip comments and empty lines