From 066dffa55f0ce7a58c6bf2d3623fcc4cac2d4ea1 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 30 Aug 2023 09:41:22 +0200
Subject: [PATCH] [bitnami/mastodon] Release 4.1.6-debian-11-r25 (#46653)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/mastodon/4/debian-11/Dockerfile       |  6 ++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     |  8 +++----
 .../debian-11/prebuildfs/usr/sbin/run-script  | 24 +++++++++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100755 bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script

diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile
index 3be24449a677d..7928dfc849e7d 100644
--- a/bitnami/mastodon/4/debian-11/Dockerfile
+++ b/bitnami/mastodon/4/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-26T08:59:57Z" \
+      org.opencontainers.image.created="2023-08-29T14:01:56Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.1.6-debian-11-r22" \
+      org.opencontainers.image.ref.name="4.1.6-debian-11-r25" \
       org.opencontainers.image.title="mastodon" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.1.6"
@@ -29,7 +29,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "python-3.9.18-0-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.6-13-linux-${OS_ARCH}-debian-11" \
       "ruby-3.0.6-5-linux-${OS_ARCH}-debian-11" \
-      "redis-client-7.2.0-1-linux-${OS_ARCH}-debian-11" \
+      "redis-client-7.0.12-31-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-15.4.0-1-linux-${OS_ARCH}-debian-11" \
       "node-16.20.2-1-linux-${OS_ARCH}-debian-11" \
       "mastodon-4.1.6-1-linux-${OS_ARCH}-debian-11" \
diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 6d265b53372b8..6e45a88b7cc06 100644
--- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -27,7 +27,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "7.2.0-1"
+        "version": "7.0.12-31"
     },
     "ruby": {
         "arch": "amd64",
diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 54987abca42aa..16183f62d0809 100644
--- a/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/mastodon/4/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -4,7 +4,7 @@
 #
 # Validation functions library
 
-# shellcheck disable=SC1091
+# shellcheck disable=SC1091,SC2086
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/liblog.sh
@@ -203,7 +203,7 @@ validate_ipv6() {
     if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
         stat=0
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -223,7 +223,7 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -242,7 +242,7 @@ validate_ip() {
     else
         stat=$(validate_ipv6 "$ip")
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
diff --git a/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script
new file mode 100755
index 0000000000000..4ca0f897277eb
--- /dev/null
+++ b/bitnami/mastodon/4/debian-11/prebuildfs/usr/sbin/run-script
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -u
+
+if [ $# -eq 0 ]; then
+    >&2 echo "No arguments provided"
+    exit 1
+fi
+
+script=$1
+exit_code="${2:-96}"
+fail_if_not_present="${3:-n}"
+
+if test -f "$script"; then
+  sh $script
+
+  if [ $? -ne 0 ]; then
+    exit $((exit_code))
+  fi
+elif [ "$fail_if_not_present" = "y" ]; then
+  >&2 echo "script not found: $script"
+  exit 127
+fi