Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-mysqlbackend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
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
caosdb
Software
caosdb-mysqlbackend
Commits
bd2fa346
Verified
Commit
bd2fa346
authored
1 year ago
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
BUG: fix utils/helpers.sh get_db_args
parent
a87e29a4
No related branches found
No related tags found
2 merge requests
!27
Release v7.0.2
,
!11
DRAFT: file system cleanup
Pipeline
#44804
passed
1 year ago
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+1
-0
1 addition, 0 deletions
Makefile
utils/helpers.sh
+5
-5
5 additions, 5 deletions
utils/helpers.sh
with
6 additions
and
5 deletions
Makefile
+
1
−
0
View file @
bd2fa346
...
@@ -86,6 +86,7 @@ pipeline-test:
...
@@ -86,6 +86,7 @@ pipeline-test:
echo
'DATABASE_USER_HOST_LIST="%,"'
>>
.config
echo
'DATABASE_USER_HOST_LIST="%,"'
>>
.config
echo
"MYSQL_USER_PASSWORD=
$(
MYSQL_ROOT_PASSWORD
)
"
>>
.config
echo
"MYSQL_USER_PASSWORD=
$(
MYSQL_ROOT_PASSWORD
)
"
>>
.config
echo
"MYSQL_HOST=
$(
SQL_HOST
)
"
>>
.config
echo
"MYSQL_HOST=
$(
SQL_HOST
)
"
>>
.config
echo
"MYSQL_OPTS=--protocol=TCP"
>>
.config
sleep
10
sleep
10
make
install
make
install
./utils/make_db restore_db tests/example.dump.sql
./utils/make_db restore_db tests/example.dump.sql
...
...
This diff is collapsed.
Click to expand it.
utils/helpers.sh
+
5
−
5
View file @
bd2fa346
...
@@ -57,16 +57,16 @@ function get_db_args {
...
@@ -57,16 +57,16 @@ function get_db_args {
}
}
function
get_db_args_nodb
{
function
get_db_args_nodb
{
if
[
-n
"
$
DATABASE
_USER
"
]
;
then
if
[
-n
"
$
MYSQL
_USER
"
]
;
then
mysql_con_arguments
=
"--user=
$
DATABASE
_USER
"
mysql_con_arguments
=
"--user=
$
MYSQL
_USER
"
fi
fi
if
[
-n
"
$
DATABASE_USER_PW
"
]
;
then
if
[
-n
"
$
MYSQL_USER_PASSWORD
"
]
;
then
mysql_con_arguments
=
"
$mysql_con_arguments
--password=
$
DATABASE_USER_PW
"
mysql_con_arguments
=
"
$mysql_con_arguments
--password=
$
MYSQL_USER_PASSWORD
"
fi
fi
if
[
-n
"
$MYSQL_HOST
"
]
&&
[
"
$MYSQL_HOST
"
!=
"localhost"
]
;
then
if
[
-n
"
$MYSQL_HOST
"
]
&&
[
"
$MYSQL_HOST
"
!=
"localhost"
]
;
then
mysql_con_arguments
=
"
$mysql_con_arguments
--host=
$MYSQL_HOST
"
mysql_con_arguments
=
"
$mysql_con_arguments
--host=
$MYSQL_HOST
"
fi
fi
if
[
-n
"
$MYSQL_PORT
"
]
&&
[
"
$MYSQL_PORT
"
!=
"3306"
]
;
then
if
[
-n
"
$MYSQL_PORT
"
]
&&
[
"
$MYSQL_PORT
"
!=
"3306"
]
;
then
mysql_con_arguments
=
"
$mysql_con_arguments
--port=
$MYSQL_PORT
"
mysql_con_arguments
=
"
$mysql_con_arguments
--port=
$MYSQL_PORT
"
fi
fi
if
[
-n
"
$MYSQL_OPTS
"
]
;
then
if
[
-n
"
$MYSQL_OPTS
"
]
;
then
...
...
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