odoo
/
docker
mirror of https://github.com/odoo/docker.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Change odoo rc location

pull/539/head
CodeByKyle 2025-02-10 21:01:10 -05:00
parent 26c0f6f433
commit 5ad9e9f431
3 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
18.0/Dockerfile
View File

@ -85,9 +85,10 @@ COPY ./entrypoint.sh /
# Copy the configuration file to the template.
COPY ./odoo.conf /etc/odoo/odoo.conf
RUN touch /etc/odoo/odoo_docker.conf
# Set permissions and Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
RUN chown odoo /etc/odoo/odoo.conf \
RUN chown odoo:odoo /etc/odoo/odoo.conf /etc/odoo/odoo_docker.conf \
&& mkdir -p /mnt/extra-addons \
&& chown -R odoo /mnt/extra-addons
VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
@ -96,7 +97,7 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
EXPOSE 8069 8071 8072
# Set the default config file
ENV ODOO_RC /etc/odoo/odoo.conf
ENV ODOO_RC /etc/odoo/odoo_docker.conf
COPY wait-for-psql.py /usr/local/bin/wait-for-psql.py

78
18.0/docker-compose.yml
View File

@ -8,45 +8,45 @@ services:
container_name: odoo
environment:
ADDONS_PATH: ${ADDONS_PATH:-/mnt/extra-addons}
DATA_DIR: ${DATA_DIR:-/var/lib/odoo}
DB_HOST: ${HOST:-${DB_PORT_5432_TCP_ADDR:-postgres}}
DB_PORT: ${PORT:-${DB_PORT_5432_TCP_PORT:-5432}}
DB_USER: ${USER:-${DB_ENV_POSTGRES_USER:-${POSTGRES_USER:-odoo}}}
DB_PASSWORD: ${PASSWORD:-${DB_ENV_POSTGRES_PASSWORD:-${POSTGRES_PASSWORD:-odoo}}}
DB_NAME: ${DB_NAME:-${DATABASE:-${DB_ENV_POSTGRES_DATABASE:-odoo}}}
ADMIN_PASSWD: ${ADMIN_PASSWD:-admin}
CSV_INTERNAL_SEP: ${CSV_INTERNAL_SEP:-,}
DB_MAXCONN: ${DB_MAXCONN:-64}
DB_TEMPLATE: ${DB_TEMPLATE:-template1}
DBFILTER: ${DBFILTER:-.*}
DEBUG_MODE: ${DEBUG_MODE:-False}
EMAIL_FROM: ${EMAIL_FROM:-False}
LIMIT_MEMORY_HARD: ${LIMIT_MEMORY_HARD:-2684354560}
LIMIT_MEMORY_SOFT: ${LIMIT_MEMORY_SOFT:-2147483648}
LIMIT_REQUEST: ${LIMIT_REQUEST:-8192}
LIMIT_TIME_CPU: ${LIMIT_TIME_CPU:-60}
LIMIT_TIME_REAL: ${LIMIT_TIME_REAL:-120}
LIST_DB: ${LIST_DB:-True}
LOG_DB: ${LOG_DB:-False}
LOG_HANDLER: ${LOG_HANDLER:-[:INFO]}
LOG_LEVEL: ${LOG_LEVEL:-info}
LOGFILE: ${LOGFILE:-None}
LONGPOLLING_PORT: ${LONGPOLLING_PORT:-8072}
MAX_CRON_THREADS: ${MAX_CRON_THREADS:-2}
OSV_MEMORY_AGE_LIMIT: ${OSV_MEMORY_AGE_LIMIT:-1.0}
OSV_MEMORY_COUNT_LIMIT: ${OSV_MEMORY_COUNT_LIMIT:-False}
SMTP_PASSWORD: ${SMTP_PASSWORD:-False}
SMTP_PORT: ${SMTP_PORT:-25}
SMTP_SERVER: ${SMTP_SERVER:-localhost}
SMTP_SSL: ${SMTP_SSL:-False}
SMTP_USER: ${SMTP_USER:-False}
WORKERS: ${WORKERS:-0}
XMLRPC: ${XMLRPC:-True}
XMLRPC_INTERFACE: ${XMLRPC_INTERFACE:-}
XMLRPC_PORT: ${XMLRPC_PORT:-8069}
XMLRPCS: ${XMLRPCS:-True}
XMLRPCS_INTERFACE: ${XMLRPCS_INTERFACE:-}
XMLRPCS_PORT: ${XMLRPCS_PORT:-8071}
# DATA_DIR: ${DATA_DIR:-/var/lib/odoo}
# DB_HOST: ${HOST:-${DB_PORT_5432_TCP_ADDR:-postgres}}
# DB_PORT: ${PORT:-${DB_PORT_5432_TCP_PORT:-5432}}
# DB_USER: ${USER:-${DB_ENV_POSTGRES_USER:-${POSTGRES_USER:-odoo}}}
# DB_PASSWORD: ${PASSWORD:-${DB_ENV_POSTGRES_PASSWORD:-${POSTGRES_PASSWORD:-odoo}}}
# DB_NAME: ${DB_NAME:-${DATABASE:-${DB_ENV_POSTGRES_DATABASE:-odoo}}}
# ADMIN_PASSWD: ${ADMIN_PASSWD:-admin}
# CSV_INTERNAL_SEP: ${CSV_INTERNAL_SEP:-,}
# DB_MAXCONN: ${DB_MAXCONN:-64}
# DB_TEMPLATE: ${DB_TEMPLATE:-template1}
# DBFILTER: ${DBFILTER:-.*}
# DEBUG_MODE: ${DEBUG_MODE:-False}
# EMAIL_FROM: ${EMAIL_FROM:-False}
# LIMIT_MEMORY_HARD: ${LIMIT_MEMORY_HARD:-2684354560}
# LIMIT_MEMORY_SOFT: ${LIMIT_MEMORY_SOFT:-2147483648}
# LIMIT_REQUEST: ${LIMIT_REQUEST:-8192}
# LIMIT_TIME_CPU: ${LIMIT_TIME_CPU:-60}
# LIMIT_TIME_REAL: ${LIMIT_TIME_REAL:-120}
# LIST_DB: ${LIST_DB:-True}
# LOG_DB: ${LOG_DB:-False}
# LOG_HANDLER: ${LOG_HANDLER:-[:INFO]}
# LOG_LEVEL: ${LOG_LEVEL:-info}
# LOGFILE: ${LOGFILE:-None}
# LONGPOLLING_PORT: ${LONGPOLLING_PORT:-8072}
# MAX_CRON_THREADS: ${MAX_CRON_THREADS:-2}
# OSV_MEMORY_AGE_LIMIT: ${OSV_MEMORY_AGE_LIMIT:-1.0}
# OSV_MEMORY_COUNT_LIMIT: ${OSV_MEMORY_COUNT_LIMIT:-False}
# SMTP_PASSWORD: ${SMTP_PASSWORD:-False}
# SMTP_PORT: ${SMTP_PORT:-25}
# SMTP_SERVER: ${SMTP_SERVER:-localhost}
# SMTP_SSL: ${SMTP_SSL:-False}
# SMTP_USER: ${SMTP_USER:-False}
# WORKERS: ${WORKERS:-0}
# XMLRPC: ${XMLRPC:-True}
# XMLRPC_INTERFACE: ${XMLRPC_INTERFACE:-}
# XMLRPC_PORT: ${XMLRPC_PORT:-8069}
# XMLRPCS: ${XMLRPCS:-True}
# XMLRPCS_INTERFACE: ${XMLRPCS_INTERFACE:-}
# XMLRPCS_PORT: ${XMLRPCS_PORT:-8071}
ports:
- "8069:8069"
- "8071:8071"

4
18.0/entrypoint.sh
View File

@ -51,9 +51,7 @@ fi
# Substitute environment variables into the config file
# and write them back to the Odoo config
export CONFIG_CONTENT;
CONFIG_CONTENT=$(envsubst < /etc/odoo/odoo.conf)
echo "$CONFIG_CONTENT" > /etc/odoo/odoo.conf
envsubst < /etc/odoo/odoo.conf > /etc/odoo/odoo_docker.conf
case "$1" in
-- | odoo)