From b9348bd3035533b13782e675838a9302e1ea5741 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 19 Aug 2025 21:13:30 +0200
Subject: [PATCH] [bitnami/mastodon] Release 4.4.3-debian-12-r10 (#85511)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/mastodon/4/debian-12/Dockerfile       | 11 +--
 .../opt/bitnami/.bitnami_components.json      |  8 +-
 .../opt/bitnami/scripts/libservice.sh         | 74 -----------------
 .../opt/bitnami/scripts/libwebserver.sh       | 80 -------------------
 4 files changed, 10 insertions(+), 163 deletions(-)

diff --git a/bitnami/mastodon/4/debian-12/Dockerfile b/bitnami/mastodon/4/debian-12/Dockerfile
index 60bcd6117355..2c1f792bb47a 100644
--- a/bitnami/mastodon/4/debian-12/Dockerfile
+++ b/bitnami/mastodon/4/debian-12/Dockerfile
@@ -8,7 +8,7 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-08-13T19:04:29Z" \
+      org.opencontainers.image.created="2025-08-19T18:18:58Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mastodon/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mastodon" \
@@ -29,11 +29,11 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "python-3.13.6-1-linux-${OS_ARCH}-debian-12" \
+      "python-3.13.7-0-linux-${OS_ARCH}-debian-12" \
       "wait-for-port-1.0.10-0-linux-${OS_ARCH}-debian-12" \
-      "ruby-3.4.5-0-linux-${OS_ARCH}-debian-12" \
-      "redis-client-8.2.0-0-linux-${OS_ARCH}-debian-12" \
-      "postgresql-client-17.5.0-1-linux-${OS_ARCH}-debian-12" \
+      "ruby-3.4.5-1-linux-${OS_ARCH}-debian-12" \
+      "redis-client-8.2.1-0-linux-${OS_ARCH}-debian-12" \
+      "postgresql-client-17.6.0-0-linux-${OS_ARCH}-debian-12" \
       "node-22.18.0-0-linux-${OS_ARCH}-debian-12" \
       "mastodon-4.4.3-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
@@ -55,6 +55,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/mastodon/postunpack.sh
 ENV APP_VERSION="4.4.3" \
     BITNAMI_APP_NAME="mastodon" \
+    IMAGE_REVISION="10" \
     LD_LIBRARY_PATH="/opt/bitnami/common/lib:$LD_LIBRARY_PATH" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/common/bin:/opt/bitnami/ruby/bin:/opt/bitnami/redis/bin:/opt/bitnami/postgresql/bin:/opt/bitnami/node/bin:/opt/bitnami/mastodon/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 2e9084c57e64..adadff54ce8f 100644
--- a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,25 +15,25 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "17.5.0-1"
+        "version": "17.6.0-0"
     },
     "python": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.13.6-1"
+        "version": "3.13.7-0"
     },
     "redis-client": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "8.2.0-0"
+        "version": "8.2.1-0"
     },
     "ruby": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.4.5-0"
+        "version": "3.4.5-1"
     },
     "wait-for-port": {
         "arch": "amd64",
diff --git a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index 1f9b33096b02..886962ebd276 100644
--- a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -142,80 +142,6 @@ EOF
     fi
 }
 
-########################
-# Remove a cron configuration file for a given service
-# Arguments:
-#   $1 - Service name
-# Returns:
-#   None
-#########################
-remove_cron_conf() {
-    local service_name="${1:?service name is missing}"
-    local cron_conf_dir="/etc/monit/conf.d"
-    rm -f "${cron_conf_dir}/${service_name}"
-}
-
-########################
-# Generate a monit configuration file for a given service
-# Arguments:
-#   $1 - Service name
-#   $2 - Pid file
-#   $3 - Start command
-#   $4 - Stop command
-# Flags:
-#   --disable - Whether to disable the monit configuration
-# Returns:
-#   None
-#########################
-generate_monit_conf() {
-    local service_name="${1:?service name is missing}"
-    local pid_file="${2:?pid file is missing}"
-    local start_command="${3:?start command is missing}"
-    local stop_command="${4:?stop command is missing}"
-    local monit_conf_dir="/etc/monit/conf.d"
-    local disabled="no"
-
-    # Parse optional CLI flags
-    shift 4
-    while [[ "$#" -gt 0 ]]; do
-        case "$1" in
-            --disable)
-                disabled="yes"
-                ;;
-            *)
-                echo "Invalid command line flag ${1}" >&2
-                return 1
-                ;;
-        esac
-        shift
-    done
-
-    is_boolean_yes "$disabled" && conf_suffix=".disabled"
-    mkdir -p "$monit_conf_dir"
-    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-check process ${service_name}
-  with pidfile "${pid_file}"
-  start program = "${start_command}" with timeout 90 seconds
-  stop program = "${stop_command}" with timeout 90 seconds
-EOF
-}
-
-########################
-# Remove a monit configuration file for a given service
-# Arguments:
-#   $1 - Service name
-# Returns:
-#   None
-#########################
-remove_monit_conf() {
-    local service_name="${1:?service name is missing}"
-    local monit_conf_dir="/etc/monit/conf.d"
-    rm -f "${monit_conf_dir}/${service_name}.conf"
-}
-
 ########################
 # Generate a logrotate configuration file
 # Arguments:
diff --git a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index acb84fc2339b..bbf4709b729f 100644
--- a/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/mastodon/4/debian-12/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -139,41 +139,6 @@ web_server_stop() {
     fi
 }
 
-########################
-# Restart web server
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_restart() {
-    info "Restarting $(web_server_type)"
-    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
-        systemctl restart "bitnami.$(web_server_type).service"
-    else
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    fi
-}
-
-########################
-# Reload web server
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_reload() {
-    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
-        systemctl reload "bitnami.$(web_server_type).service"
-    else
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    fi
-}
-
 ########################
 # Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block)
 # It serves as a wrapper for the specific web server function
@@ -429,48 +394,3 @@ web_server_update_app_configuration() {
         web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}"
     done
 }
-
-########################
-# Enable loading page, which shows users that the initialization process is not yet completed
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_enable_loading_page() {
-    ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \
-        --apache-additional-configuration "
-# Show a HTTP 503 Service Unavailable page by default
-RedirectMatch 503 ^/$
-# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
-ErrorDocument 404 /index.html
-ErrorDocument 503 /index.html" \
-        --nginx-additional-configuration "
-# Show a HTTP 503 Service Unavailable page by default
-location / {
-  return 503;
-}
-# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes
-error_page 404 @installing;
-error_page 503 @installing;
-location @installing {
-  rewrite ^(.*)$ /index.html break;
-}"
-    web_server_reload
-}
-
-########################
-# Enable loading page, which shows users that the initialization process is not yet completed
-# Globals:
-#   *
-# Arguments:
-#   None
-# Returns:
-#   None
-#########################
-web_server_disable_install_page() {
-    ensure_web_server_app_configuration_not_exists "__loading"
-    web_server_reload
-}