Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clinicaltrials
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
david Chavalarias
clinicaltrials
Commits
2900901b
Commit
2900901b
authored
Dec 21, 2016
by
Romain Loth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix config file: pipes in comments broke php's function parse_ini_file()
parent
c347ede9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
parametres_comex.ini
config/parametres_comex.ini
+1
-1
parametres.php
php_library/parametres.php
+1
-2
docker-compose.yml
setup/dockers/docker-compose.yml
+1
-2
No files found.
config/parametres_comex.ini
View file @
2900901b
...
...
@@ -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
...
...
php_library/parametres.php
View file @
2900901b
...
...
@@ -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'
]
;
}
...
...
setup/dockers/docker-compose.yml
View file @
2900901b
...
...
@@ -36,9 +36,8 @@
-
../../logs:/comex2/logs
environment
:
# override values from parametres_comex.ini
# for a
trip
le reason:
# for a
doub
le 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment