mirror of
https://github.com/odoocker/odoocker
synced 2025-11-04 15:19:22 +01:00
Merge branch 'main' into 16.0
This commit is contained in:
12
.env.example
12
.env.example
@@ -7,7 +7,7 @@ INIT=
|
|||||||
UPDATE=
|
UPDATE=
|
||||||
LOAD=base,web
|
LOAD=base,web
|
||||||
ROOT_PATH=/usr/lib/python3/dist-packages/odoo
|
ROOT_PATH=/usr/lib/python3/dist-packages/odoo
|
||||||
WORKERS=2
|
WORKERS=0
|
||||||
DEV_MODE=reload,xml
|
DEV_MODE=reload,xml
|
||||||
DOMAIN=erp.odoocker.test
|
DOMAIN=erp.odoocker.test
|
||||||
ADMIN_PASSWD=odoo
|
ADMIN_PASSWD=odoo
|
||||||
@@ -145,13 +145,13 @@ PGADMIN_PROFILES="pgadmin"
|
|||||||
|
|
||||||
# Containers' Tags
|
# Containers' Tags
|
||||||
ODOO_TAG=16.0
|
ODOO_TAG=16.0
|
||||||
POSTGRES_TAG=16.0
|
POSTGRES_TAG=16.1
|
||||||
KEYDB_TAG=latest
|
KEYDB_TAG=latest
|
||||||
MINIO_TAG=latest
|
MINIO_TAG=latest
|
||||||
NGINX_TAG=1.25.2
|
NGINX_TAG=1.25.3
|
||||||
NGINX_PROXY_TAG=1.3.1
|
NGINX_PROXY_TAG=1.4.0
|
||||||
ACME_COMPANION_TAG=2.2.8
|
ACME_COMPANION_TAG=2.2.9
|
||||||
PGADMIN_TAG=7.8
|
PGADMIN_TAG=8.0
|
||||||
|
|
||||||
# Odoocker paths
|
# Odoocker paths
|
||||||
COMMUNITY_ADDONS=${ROOT_PATH}/addons
|
COMMUNITY_ADDONS=${ROOT_PATH}/addons
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ case "$1" in
|
|||||||
# Listens to all .env variables mapped into odoo.conf file.
|
# Listens to all .env variables mapped into odoo.conf file.
|
||||||
echo odoo --config ${ODOO_RC} --database=${DB_NAME} --init=${INIT} --update=${UPDATE} --load=${LOAD} --workers=${WORKERS} --log-level=${LOG_LEVEL} --dev=${DEV_MODE}
|
echo odoo --config ${ODOO_RC} --database=${DB_NAME} --init=${INIT} --update=${UPDATE} --load=${LOAD} --workers=${WORKERS} --log-level=${LOG_LEVEL} --dev=${DEV_MODE}
|
||||||
|
|
||||||
exec odoo --config ${ODOO_RC}
|
exec odoo --config ${ODOO_RC} --init=${INIT} --update=${UPDATE} --dev=${DEV_MODE}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${APP_ENV} = 'debug' ] ; then
|
if [ ${APP_ENV} = 'debug' ] ; then
|
||||||
@@ -76,9 +76,9 @@ case "$1" in
|
|||||||
|
|
||||||
if [ ${APP_ENV} = 'production' ] ; then
|
if [ ${APP_ENV} = 'production' ] ; then
|
||||||
# Bring up Odoo ready for production.
|
# Bring up Odoo ready for production.
|
||||||
echo odoo --config ${ODOO_RC} --database= --init= --update= --load=${LOAD} --workers=${WORKERS} --log-level=${LOG_LEVEL} --load-language= --without-demo=all --dev=
|
echo odoo --config ${ODOO_RC} --database=${DB_NAME} --init=${INIT} --update=${UPDATE} --load=${LOAD} --workers=${WORKERS} --log-level=${LOG_LEVEL} --without-demo=${WITHOUT_DEMO} --load-language= --dev=
|
||||||
|
|
||||||
exec odoo --config ${ODOO_RC} --database= --init= --update= --load-language= --without-demo=all --dev=
|
exec odoo --config ${ODOO_RC} --init=${INIT} --update=${UPDATE} --load-language= --dev=
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ xmlrpcs_interface = ${XMLRPCS_INTERFACE}
|
|||||||
; --xmlrpcs-port
|
; --xmlrpcs-port
|
||||||
xmlrpcs_port = ${XMLRPCS_PORT}
|
xmlrpcs_port = ${XMLRPCS_PORT}
|
||||||
|
|
||||||
; --gevent-port | --longpolling_port (deprecated)
|
; --gevent-port | --longpolling-port (deprecated)
|
||||||
gevent_port = ${GEVENT_PORT}
|
gevent_port = ${GEVENT_PORT}
|
||||||
|
|
||||||
; --no-http | --no-xmlrpc
|
; --no-http | --no-xmlrpc
|
||||||
|
|||||||
Reference in New Issue
Block a user