diff options
| author |   Guillaume Lambert <guillaume.lambert@orange.com> | 2021-03-08 21:38:31 +0100 |
|---|---|---|
| committer | Guillaume Lambert <guillaume.lambert@orange.com> | 2021-06-15 20:18:11 +0200 |
| commit | 62178a49cc9e4088019d426636657d9f2980d242 (patch) | |
| tree | adc2fb79281e74a6ac7a1b6ae53235792526a66d /kubernetes/portal/components/portal-mariadb | |
| parent | 38634d6ef44d9d4954e553445451992e33c1f2f5 (diff) | |
[COMMON] Fix a few bashisms
pointed out by checkbashisms:
- variable name HOSTNAME
- source instead of .
- variable increments
- sleep with suffix
And migrate a few shebangs to /bin/sh
Issue-ID: OOM-2643
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>
Change-Id: I82981bcff17e88cf824935b841ce37a585ddde00
Diffstat (limited to 'kubernetes/portal/components/portal-mariadb')
| -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 c4a21b927f..b2c2621fbf 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 @@ -105,7 +105,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 @@ -155,7 +155,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}" @@ -191,7 +191,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 |