mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Docker: If DB_* env var is unset, remove the corresponding setting

Browse source
This commit is contained in:
Richard Hansen 2021-06-06 03:28:47 -04:00
parent 428f8d1684
commit de0a450aec
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -26,6 +26,8 @@
* Support for unset variables without a default value is now deprecated. * Support for unset variables without a default value is now deprecated.
Please change all instances of `"${FOO}"` in your `settings.json` to Please change all instances of `"${FOO}"` in your `settings.json` to
`${FOO:null}` to keep the current behavior. `${FOO:null}` to keep the current behavior.
* The `DB_*` variable substitutions in `settings.json.docker` that previously
defaulted to `null` now default to "undefined".
### Notable enhancements ### Notable enhancements

12
settings.json.docker
View file

@ -207,12 +207,12 @@
"dbType": "${DB_TYPE:dirty}", "dbType": "${DB_TYPE:dirty}",
"dbSettings": { "dbSettings": {
"host": "${DB_HOST:null}", "host": "${DB_HOST:undefined}",
"port": "${DB_PORT:null}", "port": "${DB_PORT:undefined}",
"database": "${DB_NAME:null}", "database": "${DB_NAME:undefined}",
"user": "${DB_USER:null}", "user": "${DB_USER:undefined}",
"password": "${DB_PASS:null}", "password": "${DB_PASS:undefined}",
"charset": "${DB_CHARSET:null}", "charset": "${DB_CHARSET:undefined}",
"filename": "${DB_FILENAME:var/dirty.db}" "filename": "${DB_FILENAME:var/dirty.db}"
}, },