diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-06-22 13:53:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-06-22 13:53:59 +0000 |
| commit | d95254082c9b7b5a060d8411a2f0bbdb3d90fb2e (patch) | |
| tree | 1cab630b3b63088417e7ce7a96b9e3cc18cd1692 /kubernetes/portal/components/portal-mariadb/resources/config | |
| parent | 697b21bc9d3c97ea76012049f1dcf05bb1b32db8 (diff) | |
| parent | 62178a49cc9e4088019d426636657d9f2980d242 (diff) | |
Merge "[COMMON] Fix a few bashisms"
Diffstat (limited to 'kubernetes/portal/components/portal-mariadb/resources/config')
| -rw-r--r-- | kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 411ed8e667..65b9636891 100644 --- a/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh +++ b/kubernetes/portal/components/portal-mariadb/resources/config/mariadb/docker-entrypoint.sh @@ -111,7 +111,7 @@ docker_temp_server_start() { # 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 - extraArgs+=( '--dont-use-mysql-root-password' ) + extraArgs=${extraArgs}( '--dont-use-mysql-root-password' ) fi if echo 'SELECT 1' |docker_process_sql "${extraArgs[@]}" --database=mysql >/dev/null 2>&1; then break @@ -161,7 +161,7 @@ docker_init_database_dir() { # beginning in 10.4.3, install_db uses "socket" which only allows system user root to connect, switch back to "normal" to allow mysql root without a password # see https://github.com/MariaDB/server/commit/b9f3f06857ac6f9105dc65caae19782f09b47fb3 # (this flag doesn't exist in 10.0 and below) - installArgs+=( --auth-root-authentication-method=normal ) + installArgs=${installArgs}( --auth-root-authentication-method=normal ) fi # "Other options are passed to mysqld." (so we pass all "mysqld" arguments directly here) mysql_install_db "${installArgs[@]}" "${@:2}" @@ -197,7 +197,7 @@ docker_setup_env() { docker_process_sql() { passfileArgs=() if [ '--dont-use-mysql-root-password' = "$1" ]; then - passfileArgs+=( "$1" ) + passfileArgs=${passfileArgs}( "$1" ) shift fi # args sent in can override this db, since they will be later in the command |