Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
IoT Platform
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IoT
IoT Platform
Commits
6e175c1e
Commit
6e175c1e
authored
6 months ago
by
Rodrigo Goncalves
Browse files
Options
Downloads
Patches
Plain Diff
Fix for environment variable names for tikiwiki db access
parent
87c27668
No related branches found
No related tags found
4 merge requests
!25
Resolve "CI/CD for SmartDataContext"
,
!24
Resolve "Fixes and optimizations for SmartDataContext"
,
!23
Resolve "SI Units for Ingress data from TikiWiki"
,
!22
Resolve "Unstructured SmartDataContext storage"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/variables.env
+3
-3
3 additions, 3 deletions
docker/variables.env
ingress/app/services/tikiwiki/TikiWikiDB.php
+1
-1
1 addition, 1 deletion
ingress/app/services/tikiwiki/TikiWikiDB.php
with
4 additions
and
4 deletions
docker/variables.env
+
3
−
3
View file @
6e175c1e
...
@@ -25,9 +25,9 @@ MONGO_DATABASE=smartdatacontext
...
@@ -25,9 +25,9 @@ MONGO_DATABASE=smartdatacontext
MONGO_HOST=mongo
MONGO_HOST=mongo
# TikiWiki
# TikiWiki
TIKIWIKIDB_HOST=
172.18.0.1
TIKIWIKIDB_HOST=
tikiwikidb-test
TIKIWIKIDB_PORT=330
7
TIKIWIKIDB_PORT=330
6
TIKIWIDB_DATABASE=tikiwiki
TIKIWI
KI
DB_DATABASE=tikiwiki
TIKIWIKDB_USERNAME=tikiwiki
TIKIWIKDB_USERNAME=tikiwiki
TIKIWIKIDB_PASSWORD=tikiwiki
TIKIWIKIDB_PASSWORD=tikiwiki
...
...
This diff is collapsed.
Click to expand it.
ingress/app/services/tikiwiki/TikiWikiDB.php
+
1
−
1
View file @
6e175c1e
...
@@ -45,7 +45,7 @@ class TikiWikiDB
...
@@ -45,7 +45,7 @@ class TikiWikiDB
{
{
$host
=
getenv
(
'TIKIWIKIDB_HOST'
)
?:
'127.0.0.1'
;
$host
=
getenv
(
'TIKIWIKIDB_HOST'
)
?:
'127.0.0.1'
;
$port
=
getenv
(
'TIKIWIKIDB_PORT'
)
?:
'3306'
;
$port
=
getenv
(
'TIKIWIKIDB_PORT'
)
?:
'3306'
;
$database
=
getenv
(
'TIKIWIDB_DATABASE'
)
?:
'tikiwiki'
;
$database
=
getenv
(
'TIKIWI
KI
DB_DATABASE'
)
?:
'tikiwiki'
;
$username
=
getenv
(
'TIKIWIKDB_USERNAME'
)
?:
'tikiwiki'
;
$username
=
getenv
(
'TIKIWIKDB_USERNAME'
)
?:
'tikiwiki'
;
$password
=
getenv
(
'TIKIWIKIDB_PASSWORD'
)
?:
'tikiwiki'
;
$password
=
getenv
(
'TIKIWIKIDB_PASSWORD'
)
?:
'tikiwiki'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment