Skip to content

Commit 69cf3ef

Browse files
[FIX] *: Consider local configuration file for development
1 parent b1ff627 commit 69cf3ef

File tree

4 files changed

+74
-40
lines changed

4 files changed

+74
-40
lines changed

Diff for: Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,13 @@ ENV \
2828
HTTP_PORT=${HTTP_PORT:-8069} \
2929
LIMIT_MEMORY_HARD=${LIMIT_MEMORY_HARD:-2684354560} \
3030
LIMIT_MEMORY_SOFT=${LIMIT_MEMORY_SOFT:-2147483648} \
31-
LIMIT_TIME_CPU=${LIMIT_TIME_CPU:-600} \
32-
LIMIT_TIME_REAL=${LIMIT_TIME_REAL:-1200} \
33-
LIMIT_TIME_REAL_CRON=${LIMIT_TIME_REAL_CRON:-300} \
31+
LIMIT_TIME_CPU=${LIMIT_TIME_CPU:-60} \
32+
LIMIT_TIME_REAL=${LIMIT_TIME_REAL:-120} \
33+
LIMIT_TIME_REAL_CRON=${LIMIT_TIME_REAL_CRON:-0} \
3434
LIST_DB=${LIST_DB:-True} \
3535
LOG_DB=${LOG_DB:-False} \
3636
LOG_DB_LEVEL=${LOG_DB_LEVEL:-warning} \
37+
LOGFILE=${LOGFILE:-None} \
3738
LOG_HANDLER=${LOG_HANDLER:-:INFO} \
3839
LOG_LEVEL=${LOG_LEVEL:-info} \
3940
MAX_CRON_THREADS=${MAX_CRON_THREADS:-2} \

Diff for: config/odoo.conf

+30-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,31 @@
11
[options]
2-
data_dir = ${DATA_DIR}
2+
data_dir = /var/lib/odoo/data
3+
; admin_passwd = admin
4+
; csv_internal_sep = ,
5+
; db_maxconn = 64
6+
; db_name = False
7+
; db_template = template1
8+
; dbfilter = .*
9+
; debug_mode = False
10+
; email_from = False
11+
; limit_memory_hard = 2684354560
12+
; limit_memory_soft = 2147483648
13+
; limit_request = 8192
14+
; limit_time_cpu = 60
15+
; limit_time_real = 120
16+
; list_db = True
17+
; log_db = False
18+
; log_handler = [':INFO']
19+
; log_level = info
20+
; max_cron_threads = 2
21+
; osv_memory_age_limit = 1.0
22+
; osv_memory_count_limit = False
23+
; smtp_password = False
24+
; smtp_port = 25
25+
; smtp_server = localhost
26+
; smtp_ssl = False
27+
; smtp_user = False
28+
; workers = 0
29+
; http = True
30+
; http_interface =
31+
; http_port = 8069

Diff for: dev-standalone.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ services:
1919
volumes:
2020
# Host paths (.vscode configuration)
2121
- ./.devcontainer/.vscode:/etc/.vscode
22+
- ./config/odoo.conf:/etc/odoo/odoo.conf
2223
environment:
2324
- LOG_LEVEL=debug
2425
- WITHOUT_DEMO=False

Diff for: resources/entrypoint.sh

+39-36
Original file line numberDiff line numberDiff line change
@@ -11,42 +11,45 @@ set -x
1111

1212
# set all variables
1313

14-
echo "
15-
[options]
16-
admin_passwd=${ADMIN_PASSWORD}
17-
data_dir = ${ODOO_DATA_DIR}
18-
db_host = ${DB_PORT_5432_TCP_ADDR}
19-
db_maxconn = ${DB_MAXCONN}
20-
db_password = ${DB_ENV_POSTGRES_PASSWORD}
21-
db_port = ${DB_PORT_5432_TCP_PORT}
22-
db_sslmode = ${DB_SSLMODE}
23-
db_template = ${DB_TEMPLATE}
24-
db_user = ${DB_ENV_POSTGRES_USER}
25-
dbfilter = ${DBFILTER}
26-
http_interface = ${HTTP_INTERFACE}
27-
http_port = ${HTTP_PORT}
28-
limit_memory_hard = ${LIMIT_MEMORY_HARD}
29-
limit_memory_soft = ${LIMIT_MEMORY_SOFT}
30-
limit_time_cpu = ${LIMIT_TIME_CPU}
31-
limit_time_real = ${LIMIT_TIME_REAL}
32-
limit_time_real_cron = ${LIMIT_TIME_REAL_CRON}
33-
list_db = ${LIST_DB}
34-
log_db = ${LOG_DB}
35-
log_db_level = ${LOG_DB_LEVEL}
36-
log_handler = ${LOG_HANDLER}
37-
log_level = ${LOG_LEVEL}
38-
max_cron_threads = ${MAX_CRON_THREADS}
39-
proxy_mode = ${PROXY_MODE}
40-
server_wide_modules = ${SERVER_WIDE_MODULES}
41-
smtp_password = ${SMTP_PASSWORD}
42-
smtp_port = ${SMTP_PORT}
43-
smtp_server = ${SMTP_SERVER}
44-
smtp_ssl = ${SMTP_SSL}
45-
smtp_user = ${SMTP_USER}
46-
test_enable = ${TEST_ENABLE}
47-
unaccent = ${UNACCENT}
48-
without_demo = ${WITHOUT_DEMO}
49-
workers = ${WORKERS}" > $ODOO_RC
14+
if [ ! -f ${ODOO_RC} ]; then
15+
echo "
16+
[options]
17+
admin_passwd = ${ADMIN_PASSWORD}
18+
data_dir = ${ODOO_DATA_DIR}
19+
db_host = ${DB_PORT_5432_TCP_ADDR}
20+
db_maxconn = ${DB_MAXCONN}
21+
db_password = ${DB_ENV_POSTGRES_PASSWORD}
22+
db_port = ${DB_PORT_5432_TCP_PORT}
23+
db_sslmode = ${DB_SSLMODE}
24+
db_template = ${DB_TEMPLATE}
25+
db_user = ${DB_ENV_POSTGRES_USER}
26+
dbfilter = ${DBFILTER}
27+
http_interface = ${HTTP_INTERFACE}
28+
http_port = ${HTTP_PORT}
29+
limit_memory_hard = ${LIMIT_MEMORY_HARD}
30+
limit_memory_soft = ${LIMIT_MEMORY_SOFT}
31+
limit_time_cpu = ${LIMIT_TIME_CPU}
32+
limit_time_real = ${LIMIT_TIME_REAL}
33+
limit_time_real_cron = ${LIMIT_TIME_REAL_CRON}
34+
list_db = ${LIST_DB}
35+
log_db = ${LOG_DB}
36+
log_db_level = ${LOG_DB_LEVEL}
37+
logfile = ${logfile}
38+
log_handler = ${LOG_HANDLER}
39+
log_level = ${LOG_LEVEL}
40+
max_cron_threads = ${MAX_CRON_THREADS}
41+
proxy_mode = ${PROXY_MODE}
42+
server_wide_modules = ${SERVER_WIDE_MODULES}
43+
smtp_password = ${SMTP_PASSWORD}
44+
smtp_port = ${SMTP_PORT}
45+
smtp_server = ${SMTP_SERVER}
46+
smtp_ssl = ${SMTP_SSL}
47+
smtp_user = ${SMTP_USER}
48+
test_enable = ${TEST_ENABLE}
49+
unaccent = ${UNACCENT}
50+
without_demo = ${WITHOUT_DEMO}
51+
workers = ${WORKERS}" > $ODOO_RC
52+
fi
5053

5154
function getAddons() {
5255

0 commit comments

Comments
 (0)