Skip to content

Commit 3878e06

Browse files
JevinDJevinD
authored
Merge pull request ursais#166 from ursais/fix-dev-pod-restart
[fix] dev pod restart
2 parents 0bd65e7 + 3c54257 commit 3878e06

File tree

6 files changed

+21
-12
lines changed

6 files changed

+21
-12
lines changed

‎odoo/12.0/entrypoint.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
# Set default value to environment variables
1010
: ${PLATFORM:='aws'}
1111
: ${RUNNING_ENV:='dev'}
12-
: ${APP_IMAGE_VERSION:='latest'}
12+
: ${APP_IMAGE_VERSION:='testing'}
1313
: ${MIGRATE:='true'}
1414
# AWS
1515
: ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
125125
}
126126

127127
function create() {
128+
echo "Start create function"
128129
EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
129130
if [ "$EXIST" != "1" ]; then
130131
echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
143144
function drop() {
144145
echo "Dropping $1"
145146
dropdb --if-exists --maintenance-db=$DEFAULTDB $1
147+
echo "Database $1 has been dropped"
146148
case "$PLATFORM" in
147149
"aws")
148150
export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
149151
! rclone purge filestore:/$BUCKET/
152+
echo "Rclone purge complete"
150153
;;
151154
"azure")
152155
! rclone purge filestore:/$RUNNING_ENV-$1/

‎odoo/12.0/templates/odoo.conf.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
33
admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
44
csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
55
data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
6-
dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
6+
dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
77
db_host = {{ default "db" .Env.PGHOST }}
88
db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
99
db_name = {{ default "False" .Env.PGDATABASE }}
@@ -23,7 +23,7 @@ limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
2323
limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
2424
limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
2525
limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
26-
limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
26+
limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
2727
limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
2828
list_db = {{ default "False" .Env.ODOO_LIST_DB }}
2929
log_db = {{ default "False" .Env.ODOO_LOG_DB }}

‎odoo/13.0/entrypoint.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
# Set default value to environment variables
1010
: ${PLATFORM:='aws'}
1111
: ${RUNNING_ENV:='dev'}
12-
: ${APP_IMAGE_VERSION:='latest'}
12+
: ${APP_IMAGE_VERSION:='testing'}
1313
: ${MIGRATE:='true'}
1414
# AWS
1515
: ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
125125
}
126126

127127
function create() {
128+
echo "Start create function"
128129
EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
129130
if [ "$EXIST" != "1" ]; then
130131
echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
143144
function drop() {
144145
echo "Dropping $1"
145146
dropdb --if-exists --maintenance-db=$DEFAULTDB $1
147+
echo "Database $1 has been dropped"
146148
case "$PLATFORM" in
147149
"aws")
148150
export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
149151
! rclone purge filestore:/$BUCKET/
152+
echo "Rclone purge complete"
150153
;;
151154
"azure")
152155
! rclone purge filestore:/$RUNNING_ENV-$1/

‎odoo/13.0/templates/odoo.conf.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
33
admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
44
csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
55
data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
6-
dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
6+
dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
77
db_host = {{ default "db" .Env.PGHOST }}
88
db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
99
db_name = {{ default "False" .Env.PGDATABASE }}
@@ -17,13 +17,13 @@ email_from = {{ default "False" .Env.ODOO_EMAIL_FROM }}
1717
geoip_database = {{ default "/usr/share/GeoIP/GeoLite2-City.mmdb" .Env.ODOO_GEOIP_DATABASE }}
1818
http_enable = {{ default "True" .Env.ODOO_HTTP_ENABLE }}
1919
http_interface = {{ default "" .Env.ODOO_HTTP_INTERFACE }}
20-
http_port = 8069
20+
http_port = {{ default "8069" .Env.ODOO_HTTP_PORT }}
2121
import_partial = {{ default "" .Env.ODOO_IMPORT_PARTIAL }}
2222
limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
2323
limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
2424
limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
2525
limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
26-
limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
26+
limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
2727
limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
2828
list_db = {{ default "False" .Env.ODOO_LIST_DB }}
2929
log_db = {{ default "False" .Env.ODOO_LOG_DB }}
@@ -32,7 +32,7 @@ logfile = {{ default "None" .Env.ODOO_LOGFILE }}
3232
log_handler = {{ default ":INFO" .Env.ODOO_LOG_HANDLER }}
3333
log_level = {{ default "info" .Env.ODOO_LOG_LEVEL }}
3434
logrotate = {{ default "False" .Env.ODOO_LOGROTATE }}
35-
longpolling_port = 8072
35+
longpolling_port = {{ default "8072" .Env.ODOO_LONGPOLLING_PORT }}
3636
max_cron_threads = {{ default "1" .Env.ODOO_MAX_CRON_THREADS }}
3737
osv_memory_count_limit = {{ default "False" .Env.ODOO_OSV_MEMORY_COUNT_LIMIT }}
3838
pg_path = {{ default "" .Env.ODOO_PG_PATH }}

‎odoo/14.0/entrypoint.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99
# Set default value to environment variables
1010
: ${PLATFORM:='aws'}
1111
: ${RUNNING_ENV:='dev'}
12-
: ${APP_IMAGE_VERSION:='latest'}
12+
: ${APP_IMAGE_VERSION:='testing'}
1313
: ${MIGRATE:='true'}
1414
# AWS
1515
: ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
125125
}
126126

127127
function create() {
128+
echo "Start create function"
128129
EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
129130
if [ "$EXIST" != "1" ]; then
130131
echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
143144
function drop() {
144145
echo "Dropping $1"
145146
dropdb --if-exists --maintenance-db=$DEFAULTDB $1
147+
echo "Database $1 has been dropped"
146148
case "$PLATFORM" in
147149
"aws")
148150
export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
149151
! rclone purge filestore:/$BUCKET/
152+
echo "Rclone purge complete"
150153
;;
151154
"azure")
152155
! rclone purge filestore:/$RUNNING_ENV-$1/

‎odoo/14.0/templates/odoo.conf.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
33
admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
44
csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
55
data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
6-
dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
6+
dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
77
db_host = {{ default "db" .Env.PGHOST }}
88
db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
99
db_name = {{ default "False" .Env.PGDATABASE }}
@@ -23,7 +23,7 @@ limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
2323
limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
2424
limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
2525
limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
26-
limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
26+
limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
2727
limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
2828
list_db = {{ default "False" .Env.ODOO_LIST_DB }}
2929
log_db = {{ default "False" .Env.ODOO_LOG_DB }}
@@ -45,7 +45,7 @@ server_wide_modules = {{ default "web,monitoring_status" .Env.ODOO_SERVER_WIDE_M
4545
smtp_password = {{ default "False" .Env.ODOO_SMTP_PASSWORD }}
4646
smtp_port = {{ default "25" .Env.ODOO_SMTP_PORT }}
4747
smtp_server = {{ default "localhost" .Env.ODOO_SMTP_SERVER }}
48-
smtp_ssl = {{ default "False" .Env.ODOO_SMTP_SSL }}
48+
smtp_ssl = {{ default "none" .Env.ODOO_SMTP_SSL }}
4949
smtp_user = {{ default "False" .Env.ODOO_SMTP_USER }}
5050
syslog = {{ default "False" .Env.ODOO_SYSLOG }}
5151
test_enable = {{ default "False" .Env.ODOO_TEST_ENABLE }}

0 commit comments

Comments
 (0)