From 9d6dde50103c08234a0385b1fe3ec13cf7a7e284 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Fri, 24 Mar 2023 17:53:03 +0100 Subject: [PATCH] [bitnami/mastodon] Release 4.1.1-debian-11-r2 (#28197) Signed-off-by: Bitnami Containers --- bitnami/mastodon/4/debian-11/Dockerfile | 4 ++-- .../opt/bitnami/scripts/libservice.sh | 2 +- .../opt/bitnami/scripts/libwebserver.sh | 24 +++++++++++++++---- .../rootfs/opt/bitnami/scripts/libmastodon.sh | 4 ++-- .../bitnami/scripts/mastodon/postunpack.sh | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile index 707ad7d2ae84..7d2a3f8362ad 100644 --- a/bitnami/mastodon/4/debian-11/Dockerfile +++ b/bitnami/mastodon/4/debian-11/Dockerfile @@ -3,10 +3,10 @@ FROM docker.io/bitnami/minideb:bullseye ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2023-03-21T15:31:19Z" \ + org.opencontainers.image.created="2023-03-24T16:09:35Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.1.1-debian-11-r1" \ + org.opencontainers.image.ref.name="4.1.1-debian-11-r2" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.1.1" diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh index 2d4b7af6fd3a..6fcb304d34cc 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -395,7 +395,7 @@ PartOf=bitnami.service Type=${type} EOF if [[ -n "$working_directory" ]]; then - cat >> "$service_file" <<< "WorkingDirectory=$working_directory" + cat >> "$service_file" <<< "WorkingDirectory=${working_directory}" fi if [[ -n "$exec_start_pre" ]]; then # This variable may contain multiple ExecStartPre= directives diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh index 818c2158032b..5860791219cf 100644 --- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh +++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -112,7 +112,11 @@ is_web_server_running() { ######################### web_server_start() { info "Starting $(web_server_type) in background" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl start "bitnami.$(web_server_type).service" + fi } ######################## @@ -126,7 +130,11 @@ web_server_start() { ######################### web_server_stop() { info "Stopping $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl stop "bitnami.$(web_server_type).service" + fi } ######################## @@ -140,7 +148,11 @@ web_server_stop() { ######################### web_server_restart() { info "Restarting $(web_server_type)" - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl restart "bitnami.$(web_server_type).service" + fi } ######################## @@ -153,7 +165,11 @@ web_server_restart() { # None ######################### web_server_reload() { - "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" + elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then + systemctl reload "bitnami.$(web_server_type).service" + fi } ######################## 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 5351288ca890..ef393d263ab6 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 @@ -284,7 +284,7 @@ mastodon_wait_for_postgresql_connection() { echo "$res" | grep -q '1 row' } if ! retry_while "debug_execute check_postgresql_connection" "$MASTODON_STARTUP_ATTEMPTS"; then - error "Could not connect to the database" + error "Could not connect to the PostgreSQL database" return 1 fi info "PostgreSQL instance is ready" @@ -311,7 +311,7 @@ mastodon_wait_for_elasticsearch_connection() { echo "$res" | grep -q 'You Know' } if ! retry_while "debug_execute check_elasticsearch_connection" "$MASTODON_STARTUP_ATTEMPTS"; then - error "Could not connect to the database" + error "Could not connect to Elasticsearch" return 1 fi info "Elasticsearch instance is ready" diff --git a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon/postunpack.sh b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon/postunpack.sh index 098e4088890e..9a90bc34e28a 100755 --- a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon/postunpack.sh +++ b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon/postunpack.sh @@ -1,6 +1,6 @@ #!/bin/bash -# shellcheck disable=SC1091 +# shellcheck disable=SC1090,SC1091 set -o errexit set -o nounset