From 2bdf947b18bfaf783ae05dfb116e35a72ee5164f Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 5 Jan 2023 02:09:41 +0100 Subject: [PATCH] [bitnami/mastodon] Release 4.0.2-debian-11-r14 (#19154) Signed-off-by: Bitnami Containers Signed-off-by: Bitnami Containers --- bitnami/mastodon/4/debian-11/Dockerfile | 2 +- .../4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh | 7 +------ bitnami/mastodon/README.md | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/bitnami/mastodon/4/debian-11/Dockerfile b/bitnami/mastodon/4/debian-11/Dockerfile index ab4ec8e20bf7..899da2e22016 100644 --- a/bitnami/mastodon/4/debian-11/Dockerfile +++ b/bitnami/mastodon/4/debian-11/Dockerfile @@ -4,7 +4,7 @@ ARG TARGETARCH LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \ org.opencontainers.image.description="Application packaged by Bitnami" \ - org.opencontainers.image.ref.name="4.0.2-debian-11-r13" \ + org.opencontainers.image.ref.name="4.0.2-debian-11-r14" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mastodon" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ diff --git a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh index 573b0112ce3e..33b2c906cdb0 100644 --- a/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh +++ b/bitnami/mastodon/4/debian-11/rootfs/opt/bitnami/scripts/mastodon-env.sh @@ -28,7 +28,6 @@ mastodon_env_vars=( MASTODON_ADMIN_USERNAME MASTODON_ADMIN_PASSWORD MASTODON_ADMIN_EMAIL - MASTODON_EMAIL_DOMAIN_ALLOWLIST MASTODON_ALLOW_ALL_DOMAINS MASTODON_SECRET_KEY_BASE MASTODON_OTP_SECRET @@ -69,7 +68,6 @@ mastodon_env_vars=( MASTODON_S3_REGION MASTODON_S3_ENDPOINT MASTODON_STARTUP_ATTEMPTS - EMAIL_DOMAIN_ALLOWLIST SECRET_KEY_BASE OTP_SECRET WEB_DOMAIN @@ -124,10 +122,7 @@ export ALLOW_EMPTY_PASSWORD="${ALLOW_EMPTY_PASSWORD:-no}" export MASTODON_CREATE_ADMIN="${MASTODON_CREATE_ADMIN:-true}" export MASTODON_ADMIN_USERNAME="${MASTODON_ADMIN_USERNAME:-user}" export MASTODON_ADMIN_PASSWORD="${MASTODON_ADMIN_PASSWORD:-bitnami1}" -export MASTODON_ADMIN_EMAIL="${MASTODON_ADMIN_EMAIL:-user@example.com}" -MASTODON_EMAIL_DOMAIN_ALLOWLIST="${MASTODON_EMAIL_DOMAIN_ALLOWLIST:-"${EMAIL_DOMAIN_ALLOWLIST:-}"}" -export MASTODON_EMAIL_DOMAIN_ALLOWLIST="${MASTODON_EMAIL_DOMAIN_ALLOWLIST:-example.com}" -export EMAIL_DOMAIN_ALLOWLIST="$MASTODON_EMAIL_DOMAIN_ALLOWLIST" +export MASTODON_ADMIN_EMAIL="${MASTODON_ADMIN_EMAIL:-user@bitnami.org}" export MASTODON_ALLOW_ALL_DOMAINS="${MASTODON_ALLOW_ALL_DOMAINS:-true}" MASTODON_SECRET_KEY_BASE="${MASTODON_SECRET_KEY_BASE:-"${SECRET_KEY_BASE:-}"}" export MASTODON_SECRET_KEY_BASE="${MASTODON_SECRET_KEY_BASE:-bitnami123}" diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 272a20cd2cc5..01365cbba1d3 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -146,7 +146,7 @@ The running mode is defined via the `MASTODON_MODE` environment variable. The po - `MASTODON_CREATE_ADMIN`: Create admin users if it does not exist. Default: **true** - `MASTODON_ADMIN_USERNAME`: Mastodon application username. Default: **user** - `MASTODON_ADMIN_PASSWORD`: Mastodon application password. Default: **bitnami1** -- `MASTODON_ADMIN_EMAIL`: Mastodon application email. Default: **user@example.com** +- `MASTODON_ADMIN_EMAIL`: Mastodon application email. Default: **user@bitnami.org** - `MASTODON_HTTPS_ENABLED`: Set the Mastodon Puma server as HTTPS. Default: **false**. - `MASTODON_ALLOW_ALL_DOMAINS`: Disable the Mastodon host verification process. Default: **true**. - `MASTODON_DATA_TO_PERSIST`: Space separated list of files and directories to persist. Use a space to persist no data: `" "`. Default: **public/system, public/assets**