Merge pull request #166 from ursais/fix-dev-pod-restart

[fix] dev pod restart
ursais · Dec 2, 2021 · 3878e06 · 3878e06
2 parents 0bd65e7 + 3c54257
commit 3878e06
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/odoo/12.0/entrypoint.sh b/odoo/12.0/entrypoint.sh
@@ -9,7 +9,7 @@ set -e
 # Set default value to environment variables
 : ${PLATFORM:='aws'}
 : ${RUNNING_ENV:='dev'}
-: ${APP_IMAGE_VERSION:='latest'}
+: ${APP_IMAGE_VERSION:='testing'}
 : ${MIGRATE:='true'}
 # AWS
 : ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
 }
 
 function create() {
+  echo "Start create function"
   EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
   if [ "$EXIST" != "1" ]; then
     echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
 function drop() {
   echo "Dropping $1"
   dropdb --if-exists --maintenance-db=$DEFAULTDB $1
+  echo "Database $1 has been dropped"
   case "$PLATFORM" in
     "aws")
       export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
       ! rclone purge filestore:/$BUCKET/
+      echo "Rclone purge complete"
       ;;
     "azure")
       ! rclone purge filestore:/$RUNNING_ENV-$1/

diff --git a/odoo/12.0/templates/odoo.conf.tmpl b/odoo/12.0/templates/odoo.conf.tmpl
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
 admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
 csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
 data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
-dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
+dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
 db_host = {{ default "db" .Env.PGHOST }}
 db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
 db_name = {{ default "False" .Env.PGDATABASE }}
@@ -23,7 +23,7 @@ limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
 limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
 limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
 limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
-limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
+limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
 limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
 list_db = {{ default "False" .Env.ODOO_LIST_DB }}
 log_db = {{ default "False" .Env.ODOO_LOG_DB }}

diff --git a/odoo/13.0/entrypoint.sh b/odoo/13.0/entrypoint.sh
@@ -9,7 +9,7 @@ set -e
 # Set default value to environment variables
 : ${PLATFORM:='aws'}
 : ${RUNNING_ENV:='dev'}
-: ${APP_IMAGE_VERSION:='latest'}
+: ${APP_IMAGE_VERSION:='testing'}
 : ${MIGRATE:='true'}
 # AWS
 : ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
 }
 
 function create() {
+  echo "Start create function"
   EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
   if [ "$EXIST" != "1" ]; then
     echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
 function drop() {
   echo "Dropping $1"
   dropdb --if-exists --maintenance-db=$DEFAULTDB $1
+  echo "Database $1 has been dropped"
   case "$PLATFORM" in
     "aws")
       export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
       ! rclone purge filestore:/$BUCKET/
+      echo "Rclone purge complete"
       ;;
     "azure")
       ! rclone purge filestore:/$RUNNING_ENV-$1/

diff --git a/odoo/13.0/templates/odoo.conf.tmpl b/odoo/13.0/templates/odoo.conf.tmpl
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
 admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
 csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
 data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
-dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
+dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
 db_host = {{ default "db" .Env.PGHOST }}
 db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
 db_name = {{ default "False" .Env.PGDATABASE }}
@@ -17,13 +17,13 @@ email_from = {{ default "False" .Env.ODOO_EMAIL_FROM }}
 geoip_database = {{ default "/usr/share/GeoIP/GeoLite2-City.mmdb" .Env.ODOO_GEOIP_DATABASE }}
 http_enable = {{ default "True" .Env.ODOO_HTTP_ENABLE }}
 http_interface = {{ default "" .Env.ODOO_HTTP_INTERFACE }}
-http_port = 8069
+http_port = {{ default "8069" .Env.ODOO_HTTP_PORT }}
 import_partial = {{ default "" .Env.ODOO_IMPORT_PARTIAL }}
 limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
 limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
 limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
 limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
-limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
+limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
 limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
 list_db = {{ default "False" .Env.ODOO_LIST_DB }}
 log_db = {{ default "False" .Env.ODOO_LOG_DB }}
@@ -32,7 +32,7 @@ logfile = {{ default "None" .Env.ODOO_LOGFILE }}
 log_handler = {{ default ":INFO" .Env.ODOO_LOG_HANDLER }}
 log_level = {{ default "info" .Env.ODOO_LOG_LEVEL }}
 logrotate = {{ default "False" .Env.ODOO_LOGROTATE }}
-longpolling_port = 8072
+longpolling_port = {{ default "8072" .Env.ODOO_LONGPOLLING_PORT }}
 max_cron_threads = {{ default "1" .Env.ODOO_MAX_CRON_THREADS }}
 osv_memory_count_limit = {{ default "False" .Env.ODOO_OSV_MEMORY_COUNT_LIMIT }}
 pg_path = {{ default "" .Env.ODOO_PG_PATH }}

diff --git a/odoo/14.0/entrypoint.sh b/odoo/14.0/entrypoint.sh
@@ -9,7 +9,7 @@ set -e
 # Set default value to environment variables
 : ${PLATFORM:='aws'}
 : ${RUNNING_ENV:='dev'}
-: ${APP_IMAGE_VERSION:='latest'}
+: ${APP_IMAGE_VERSION:='testing'}
 : ${MIGRATE:='true'}
 # AWS
 : ${AWS_HOST:='false'}
@@ -125,6 +125,7 @@ function duplicate() {
 }
 
 function create() {
+  echo "Start create function"
   EXIST=$(psql -X -A -t $DEFAULTDB -c "SELECT 1 AS result FROM pg_database WHERE datname = '$1'";)
   if [ "$EXIST" != "1" ]; then
     echo "Creating $1"
@@ -143,10 +144,12 @@ function create() {
 function drop() {
   echo "Dropping $1"
   dropdb --if-exists --maintenance-db=$DEFAULTDB $1
+  echo "Database $1 has been dropped"
   case "$PLATFORM" in
     "aws")
       export BUCKET=`echo $AWS_BUCKETNAME | sed -e "s/{db}/$1/g"`
       ! rclone purge filestore:/$BUCKET/
+      echo "Rclone purge complete"
       ;;
     "azure")
       ! rclone purge filestore:/$RUNNING_ENV-$1/

diff --git a/odoo/14.0/templates/odoo.conf.tmpl b/odoo/14.0/templates/odoo.conf.tmpl
@@ -3,7 +3,7 @@ addons_path = {{ default "/odoo/addons" .Env.ODOO_ADDONS_PATH }}
 admin_passwd = {{ default "admin" .Env.ODOO_ADMIN_PASSWD }}
 csv_internal_sep = {{ default "," .Env.ODOO_CSV_INTERNAL_SEP }}
 data_dir = {{ default "/odoo/data" .Env.ODOO_DATA_DIR }}
-dbfilter = {{ default "^[^backup|defaultdb].*$" .Env.ODOO_DBFILTER }}
+dbfilter = {{ default "^.*[^backup].*$" .Env.ODOO_DBFILTER }}
 db_host = {{ default "db" .Env.PGHOST }}
 db_maxconn = {{ default "64" .Env.ODOO_DB_MAXCONN }}
 db_name = {{ default "False" .Env.PGDATABASE }}
@@ -23,7 +23,7 @@ limit_memory_hard = {{ default "4294967296" .Env.ODOO_LIMIT_MEMORY_HARD }}
 limit_memory_soft = {{ default "2147483648" .Env.ODOO_LIMIT_MEMORY_SOFT }}
 limit_request = {{ default "8192" .Env.ODOO_LIMIT_REQUEST }}
 limit_time_cpu = {{ default "1800" .Env.ODOO_LIMIT_TIME_CPU }}
-limit_time_real_cron = {{ default "120" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
+limit_time_real_cron = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL_CRON }}
 limit_time_real = {{ default "1800" .Env.ODOO_LIMIT_TIME_REAL }}
 list_db = {{ default "False" .Env.ODOO_LIST_DB }}
 log_db = {{ default "False" .Env.ODOO_LOG_DB }}
@@ -45,7 +45,7 @@ server_wide_modules = {{ default "web,monitoring_status" .Env.ODOO_SERVER_WIDE_M
 smtp_password = {{ default "False" .Env.ODOO_SMTP_PASSWORD }}
 smtp_port = {{ default "25" .Env.ODOO_SMTP_PORT }}
 smtp_server = {{ default "localhost" .Env.ODOO_SMTP_SERVER }}
-smtp_ssl = {{ default "False" .Env.ODOO_SMTP_SSL }}
+smtp_ssl = {{ default "none" .Env.ODOO_SMTP_SSL }}
 smtp_user = {{ default "False" .Env.ODOO_SMTP_USER }}
 syslog = {{ default "False" .Env.ODOO_SYSLOG }}
 test_enable = {{ default "False" .Env.ODOO_TEST_ENABLE }}