Release 2.2.2 - See CHANGELOG.md

Fix Docker Secrets injection from DB_USER_FILE/DB_PASS_FILE

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.2.2 2020-09-22 <tpansino@github>
+
+   ### Fixed
+      - Patch for 2.2.0 release fixing Docker Secrets Support. Was skipping password check.
+
 ## 2.2.1 2020-09-17 <alwynpan@github>
 
    ### Fixed

install/etc/services.available/10-db-backup/run

@@ -33,23 +33,23 @@ case "$dbtype" in
     "mongo" | "mongodb" | "MONGO" | "MONGODB" )
         dbtype=mongo
         dbport=${DB_PORT:-27017}
-        [[ ( -n "${DB_USER}" ) ]] && file_env 'DB_USER'
+        [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "mysql" | "MYSQL" | "mariadb" | "MARIADB")
         dbtype=mysql
         dbport=${DB_PORT:-3306}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "postgres" | "postgresql" | "pgsql" | "POSTGRES" | "POSTGRESQL" | "PGSQL" )
         dbtype=pgsql
         dbport=${DB_PORT:-5432}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "redis" | "REDIS"   )
         dbtype=redis
         dbport=${DB_PORT:-6379}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" || ( -n "${DB_PASS_FILE}" ) ) ]] && file_env 'DB_PASS'
     ;;
 esac