[bitnami/mastodon] Release 4.1.2-debian-11-r31 (#39425)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
This commit is contained in:
Bitnami Bot
2023-06-30 12:24:41 +02:00
committed by GitHub
parent 237c488e90
commit 696d85d4ed
3 changed files with 21 additions and 9 deletions

View File

@@ -6,10 +6,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-06-27T08:50:24Z" \
org.opencontainers.image.created="2023-06-30T09:50:16Z" \
org.opencontainers.image.description="Application packaged by VMware, Inc" \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.ref.name="4.1.2-debian-11-r30" \
org.opencontainers.image.ref.name="4.1.2-debian-11-r31" \
org.opencontainers.image.title="mastodon" \
org.opencontainers.image.vendor="VMware, Inc." \
org.opencontainers.image.version="4.1.2"
@@ -26,7 +26,7 @@ RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libbsd0 li
RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
COMPONENTS=( \
"python-3.9.17-1-linux-${OS_ARCH}-debian-11" \
"wait-for-port-1.0.6-8-linux-${OS_ARCH}-debian-11" \
"wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \
"ruby-3.0.6-2-linux-${OS_ARCH}-debian-11" \
"redis-client-7.0.11-1-linux-${OS_ARCH}-debian-11" \
"postgresql-client-15.3.0-1-linux-${OS_ARCH}-debian-11" \

View File

@@ -39,6 +39,6 @@
"arch": "amd64",
"distro": "debian-11",
"type": "NAMI",
"version": "1.0.6-8"
"version": "1.0.6-9"
}
}

View File

@@ -106,8 +106,6 @@ generate_cron_conf() {
local schedule="* * * * *"
local clean="true"
local clean="true"
# Parse optional CLI flags
shift 2
while [[ "$#" -gt 0 ]]; do
@@ -133,7 +131,12 @@ generate_cron_conf() {
mkdir -p /etc/cron.d
if "$clean"; then
echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
cat > "/etc/cron.d/${service_name}" <<EOF
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0
${schedule} ${run_as} ${cmd}
EOF
else
echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
fi
@@ -189,7 +192,10 @@ generate_monit_conf() {
is_boolean_yes "$disabled" && conf_suffix=".disabled"
mkdir -p "$monit_conf_dir"
cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0
check process ${service_name}
with pidfile "${pid_file}"
start program = "${start_command}" with timeout 90 seconds
@@ -248,7 +254,10 @@ generate_logrotate_conf() {
done
mkdir -p "$logrotate_conf_dir"
cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0
${log_path} {
${period}
rotate ${rotations}
@@ -393,6 +402,9 @@ generate_systemd_conf() {
fi
# Generate the Systemd unit
cat > "$service_file" <<EOF
# Copyright VMware, Inc.
# SPDX-License-Identifier: APACHE-2.0
[Unit]
Description=Bitnami service for ${name}
# Starting/stopping the main bitnami service should cause the same effect for this service