diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-06-23 10:59:03 +0200 |
|---|---|---|
| committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2021-06-23 09:02:07 +0000 |
| commit | fe651c1283fbdd67bd4482727f5b7298d55df9d8 (patch) | |
| tree | 0664a7beafbb2723c70a9769a53f7e869c2d5643 /kubernetes/portal/components/portal-mariadb/resources | |
| parent | e1cafc0b0ca244007dd0f0b0dcc84bbf6fa784d5 (diff) | |
[COMMON] Revert "[COMMON] Fix a few bashisms"
This reverts commit 62178a49cc9e4088019d426636657d9f2980d242.
This commit introduced regression on portal db config job which is now
unable to start:
/usr/local/bin/docker-entrypoint.sh: line 114: syntax error near unexpected token `('
Issue-ID: OOM-1
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
Change-Id: I3cb72cd7625b180b364b713fe942d5956736ebef
Diffstat (limited to 'kubernetes/portal/components/portal-mariadb/resources')
| -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 65b9636891..411ed8e667 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=${extraArgs}( '--dont-use-mysql-root-password' ) + 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=${installArgs}( --auth-root-authentication-method=normal ) + 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=${passfileArgs}( "$1" ) + passfileArgs+=( "$1" ) shift fi # args sent in can override this db, since they will be later in the command |