[bitnami/mastodon] Release 4.1.1-debian-11-r2 (#28197)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-03-24 17:53:03 +01:00
committed by GitHub
parent 84fa895226
commit 9d6dde5010
5 changed files with 26 additions and 10 deletions
+2 -2
View File
@@ -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"
@@ -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
@@ -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
}
########################
@@ -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"
@@ -1,6 +1,6 @@
#!/bin/bash
# shellcheck disable=SC1091
# shellcheck disable=SC1090,SC1091
set -o errexit
set -o nounset