Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[UUI] Service Mesh Compliance for UUI"
[oom.git]
/
kubernetes
/
portal
/
components
/
portal-mariadb
/
resources
/
config
/
mariadb
/
docker-entrypoint.sh
diff --git
a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
index
ddaf099
..
7098779
100644
(file)
--- a/
kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
+++ b/
kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh
@@
-1,7
+1,6
@@
#!/bin/bash
set -eo pipefail
#!/bin/bash
set -eo pipefail
-shopt -s nullglob
# logging functions
mysql_log() {
# logging functions
mysql_log() {
@@
-111,7
+110,7
@@
docker_temp_server_start() {
# only use the root password if the database has already been initializaed
# so that it won't try to fill in a password file when it hasn't been set yet
extraArgs=""
# only use the root password if the database has already been initializaed
# so that it won't try to fill in a password file when it hasn't been set yet
extraArgs=""
- if [
-z "$DATABASE_ALREADY_EXISTS
" ]; then
+ if [
"$DATABASE_ALREADY_EXISTS" = "false
" ]; then
extraArgs=${extraArgs}" --dont-use-mysql-root-password"
fi
if echo 'SELECT 1' |docker_process_sql ${extraArgs} --database=mysql >/dev/null 2>&1; then
extraArgs=${extraArgs}" --dont-use-mysql-root-password"
fi
if echo 'SELECT 1' |docker_process_sql ${extraArgs} --database=mysql >/dev/null 2>&1; then
@@
-170,11
+169,20
@@
docker_init_database_dir() {
mysql_note "Database files initialized"
}
mysql_note "Database files initialized"
}
+if [ -z "$DATADIR" ]; then
+ DATADIR='unknown'
+fi
+if [ -z "$SOCKET" ]; then
+ SOCKET='unknown'
+fi
+if [ -z "$DATABASE_ALREADY_EXISTS" ]; then
+ DATABASE_ALREADY_EXISTS='false'
+fi
+
# Loads various settings that are used elsewhere in the script
# This should be called after mysql_check_config, but before any other functions
docker_setup_env() {
# Get config
# Loads various settings that are used elsewhere in the script
# This should be called after mysql_check_config, but before any other functions
docker_setup_env() {
# Get config
- declare -g DATADIR SOCKET
DATADIR="$(mysql_get_config 'datadir' "$@")"
SOCKET="$(mysql_get_config 'socket' "$@")"
DATADIR="$(mysql_get_config 'datadir' "$@")"
SOCKET="$(mysql_get_config 'socket' "$@")"
@@
-186,7
+194,6
@@
docker_setup_env() {
file_env 'MYSQL_ROOT_PASSWORD'
file_env 'PORTAL_DB_TABLES'
file_env 'MYSQL_ROOT_PASSWORD'
file_env 'PORTAL_DB_TABLES'
- declare -g DATABASE_ALREADY_EXISTS
if [ -d "$DATADIR/mysql" ]; then
DATABASE_ALREADY_EXISTS='true'
fi
if [ -d "$DATADIR/mysql" ]; then
DATABASE_ALREADY_EXISTS='true'
fi
@@
-337,7
+344,7
@@
_main() {
fi
# there's no database, so it needs to be initialized
fi
# there's no database, so it needs to be initialized
- if [
-z "$DATABASE_ALREADY_EXISTS
" ]; then
+ if [
"$DATABASE_ALREADY_EXISTS" = "false
" ]; then
docker_verify_minimum_env
# check dir permissions to reduce likelihood of half-initialized database
docker_verify_minimum_env
# check dir permissions to reduce likelihood of half-initialized database