Commit 2900901b authored by Romain Loth's avatar Romain Loth

fix config file: pipes in comments broke php's function parse_ini_file()

parent c347ede9
......@@ -3,7 +3,7 @@
COMEX_HOST=0.0.0.0
COMEX_PORT=9090
# that's how much we'll log from services: DEBUG|INFO|WARNING|ERROR
# that's how much we'll log from services: DEBUG,INFO,WARNING,ERROR
LOG_LEVEL=DEBUG
LOG_FILE=services.log
......
......@@ -10,7 +10,7 @@ $min_num_friends=0;// nombre minimal de voisin que doit avoir un scholar pour ê
We attempt in order:
1 - retrieve SQL_HOST from bash ENV (set by docker-compose or admin)
2 - otherwise retrieve from INI file (buggy)
2 - otherwise retrieve from INI file
3 - otherwise try 172.17.0.2 (first docker IP)
POSSIBLE: use same behavior for the other sql vars (port, db, user & pass)
......@@ -21,7 +21,6 @@ $sql_host = getenv("SQL_HOST");
# 2 - INI file read
if (empty($sql_host)) {
// TODO debug
$params = parse_ini_file("config/parametres_comex.ini");
$sql_host = $params['SQL_HOST'] ;
}
......
......@@ -36,9 +36,8 @@
- ../../logs:/comex2/logs
environment:
# override values from parametres_comex.ini
# for a triple reason:
# for a double reason:
# - both apps have ENV vals preempt INI vals
# - the php app INI support is buggy
# - if we're here (in docker-compose) then by definition the mysql must be coming from comex_db_test container
- SQL_HOST=comex_db_test
- SQL_PORT=3306
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment