Skip to content

Commit 340b964

Browse files
committed
add support for templates per major varion
1 parent b2acb6e commit 340b964

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

src/odoo/templates/answers.sh renamed to src/odoo/{% if branch_name in ('14.0','15.0','16.0','17.0') %}templates{% endif %}/answers.sh

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ declare -x DB_NAME="${DB_NAME:-}"
66
declare -x DB_USER="${DB_USER:-}"
77
declare -x DB_PASSWORD="${DB_PASSWORD:-}"
88
declare -x DB_SSLMODE="${DB_SSLMODE:-prefer}"
9-
declare -x DB_FILTER="${DB_FILTER:-}"
9+
declare -x DB_FILTER="${DB_FILTER:-^(${DB_NAME//,/|})$}"
1010
declare -x LIST_DB="${LIST_DB:-False}"
1111
declare -x ADMIN_PASSWD="${ADMIN_PASSWD:-}"
1212
declare -x DB_MAXCONN="${DB_MAXCONN:-64}"
@@ -15,24 +15,25 @@ declare -x LIMIT_MEMORY_HARD="${LIMIT_MEMORY_HARD:-2684354560}"
1515
declare -x LIMIT_REQUEST="${LIMIT_REQUEST:-8192}"
1616
declare -x LIMIT_TIME_CPU="${LIMIT_TIME_CPU:-60}"
1717
declare -x LIMIT_TIME_REAL="${LIMIT_TIME_REAL:-120}"
18+
declare -x LIMIT_TIME_REAL_CRON="${LIMIT_TIME_REAL_CRON:-120}"
1819
declare -x LOG_HANDLER="${LOG_HANDLER:-':INFO'}"
1920
declare -x LOG_LEVEL="${LOG_LEVEL:-info}"
2021
declare -x MAX_CRON_THREADS="${MAX_CRON_THREADS:-2}"
2122
declare -x WORKERS="${WORKERS:-4}"
22-
declare -x LOGFILE="${LOGFILE:-}"
23+
declare -x LOGFILE="${LOGFILE:-None}"
2324
declare -x LOG_DB="${LOG_DB:-False}"
2425
declare -x SYSLOG="${SYSLOG:-False}"
2526
declare -x RUNNING_ENV="${RUNNING_ENV:-dev}"
2627
declare -x WITHOUT_DEMO="${WITHOUT_DEMO:-True}"
2728
declare -x SERVER_WIDE_MODULES="${SERVER_WIDE_MODULES:-}"
2829
declare -x UNACCENT="${UNACCENT:-False}"
2930
declare -x ADDITIONAL_ODOO_RC="${ADDITIONAL_ODOO_RC:-}"
30-
declare -x SENTRY="${SENTRY:-False}"
31-
declare -x SENTRY_DSN="${SENTRY_DSN:-''}"
32-
declare -x SENTRY_RELEASE="${SENTRY_RELEASE:-}"
33-
declare -x SENTRY_TRACES_SAMPLE_RATE="${SENTRY_TRACES_SAMPLE_RATE:-}"
34-
declare -x ENCRYPTION_KEY_DEV="${ENCRYPTION_KEY_DEV:-}"
35-
declare -x ENCRYPTION_KEY_CI="${ENCRYPTION_KEY_CI:-}"
36-
declare -x ENCRYPTION_KEY_PROD="${ENCRYPTION_KEY_PROD:-}"
37-
declare -x AUTH_OAUTH_PROVIDER_CLIENT_ID="${AUTH_OAUTH_PROVIDER_CLIENT_ID:-}"
38-
declare -x AUTH_OAUTH_PROVIDER_CLIENT_SECRET="${AUTH_OAUTH_PROVIDER_CLIENT_SECRET:-}"
31+
# diff with upstream
32+
# we don't use PG vars because they should be explicitely
33+
# defined in docker compose files
34+
# the entrypoint is not run by docker exec
35+
#declare -x PGHOST=${DB_HOST}
36+
#declare -x PGPORT=${DB_PORT:-5432}
37+
#declare -x PGUSER=${DB_USER}
38+
#declare -x PGPASSWORD=${DB_PASSWORD}
39+
#declare -x PGDATABASE=${DB_NAME}

src/odoo/templates/odoo.cfg.tmpl renamed to src/odoo/{% if branch_name in ('14.0','15.0','16.0','17.0') %}templates{% endif %}/odoo.cfg.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limit_memory_hard = ${LIMIT_MEMORY_HARD}
1818
limit_request = ${LIMIT_REQUEST}
1919
limit_time_cpu = ${LIMIT_TIME_CPU}
2020
limit_time_real = ${LIMIT_TIME_REAL}
21-
limit_time_real_cron = ${LIMIT_TIME_REAL}
21+
limit_time_real_cron = ${LIMIT_TIME_REAL_CRON}
2222
log_handler = ${LOG_HANDLER}
2323
log_level = ${LOG_LEVEL}
2424
max_cron_threads = ${MAX_CRON_THREADS}
@@ -39,7 +39,7 @@ proxy_mode = True
3939
; http_port = 8069
4040
; http_enable = True
4141
; http_interface =
42-
; longpolling_port = 8072
42+
; gevent_port = 8072
4343
; osv_memory_age_limit = 1.0
4444
; osv_memory_count_limit = False
4545
; smtp_password = False

0 commit comments

Comments
 (0)