From 867f8718595b47fe49032cb6549cd0e77f544653 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Wed, 11 Jan 2023 03:43:31 +0100 Subject: [PATCH] [bitnami/mastodon] Release 4.0.2-debian-11-r16 (#19807) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/mastodon/4/debian-11/Dockerfile | 2 +- .../debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh | 2 +- .../4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile index f981ea3e5352..98ebc5b6d8ad 100644 --- a/bitnami/mastodon/4/debian-11/Dockerfile +++ b/bitnami/mastodon/4/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="4.0.2-debian-11-r15" \ + org.opencontainers.image.ref.name="4.0.2-debian-11-r16" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mastodon" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh index f3bc7568bfa5..ad2f0eee48df 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -31,7 +31,7 @@ get_sematic_version () { while [[ $i -lt $n ]]; do if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]]; then - version_sections[$j]=${BASH_REMATCH[$i]} + version_sections[j]="${BASH_REMATCH[$i]}" ((j++)) fi ((i++)) diff --git a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh index ac05bbfe0f04..986f95019027 100644 --- a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh +++ b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/libmastodon.sh @@ -235,15 +235,15 @@ mastodon_ensure_admin_user_exists() { cd "$MASTODON_BASE_DIR" || exit # We use the tootctl tool to create the admin user # https://github.com/mastodon/mastodon/blob/main/chart/templates/job-create-admin.yaml#L50 - local -r cmd="tootctl" + local -r cmd=("tootctl") local -r args=("accounts" "create" "$MASTODON_ADMIN_USERNAME" "--email" "$MASTODON_ADMIN_EMAIL" "--confirmed" "--role" "Owner") local res="" if am_i_root; then # Adding true to avoid the logic to exit - res="$(gosu "$MASTODON_DAEMON_USER" "$cmd" "${args[@]}" || true)" + res="$(gosu "$MASTODON_DAEMON_USER" "${cmd[@]}" "${args[@]}" || true)" else # Adding true to avoid the logic to exit - res="$("$cmd" "${args[@]}" || true)" + res="$("${cmd[@]}" "${args[@]}" || true)" fi if [[ "$res" =~ "OK" ]]; then