From 4fe772bc082a500799f88e2c1b6b42c8fef58cb7 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 29 Feb 2024 19:38:21 +0100 Subject: [PATCH] [bitnami/mastodon] Release 4.2.8-debian-12-r2 (#63469) Signed-off-by: Bitnami Containers --- bitnami/mastodon/4/debian-12/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../rootfs/opt/bitnami/scripts/mastodon-env.sh | 12 ------------ bitnami/mastodon/README.md | 2 -- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/bitnami/mastodon/4/debian-12/Dockerfile b/bitnami/mastodon/4/debian-12/Dockerfile index 14abbefefb64..39503cc34a11 100644 --- a/bitnami/mastodon/4/debian-12/Dockerfile +++ b/bitnami/mastodon/4/debian-12/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-02-29T13:06:48Z" \ + org.opencontainers.image.created="2024-02-29T17:10:37Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.2.8-debian-12-r1" \ + org.opencontainers.image.ref.name="4.2.8-debian-12-r2" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.2.8" @@ -32,7 +32,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ "redis-client-7.0.15-3-linux-${OS_ARCH}-debian-12" \ "postgresql-client-16.2.0-2-linux-${OS_ARCH}-debian-12" \ "node-20.11.1-0-linux-${OS_ARCH}-debian-12" \ - "mastodon-4.2.8-0-linux-${OS_ARCH}-debian-12" \ + "mastodon-4.2.8-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ 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 099d3596d171..b7605bb0efac 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 @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "4.2.8-0" + "version": "4.2.8-1" }, "node": { "arch": "amd64", diff --git a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh index 161351951057..b557e03ce006 100644 --- a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh +++ b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/mastodon-env.sh @@ -101,10 +101,6 @@ mastodon_env_vars=( AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID S3_ENDPOINT - MASTODON_AUTHORIZED_FETCH - MASTODON_LIMITED_FEDERATION_MODE - AUTHORIZED_FETCH - LIMITED_FEDERATION_MODE ) for env_var in "${mastodon_env_vars[@]}"; do file_env_var="${env_var}_FILE" @@ -171,14 +167,6 @@ export BIND="$MASTODON_BIND_ADDRESS" export MASTODON_CFG_BIND="$MASTODON_BIND_ADDRESS" export MASTODON_DATA_TO_PERSIST="${MASTODON_DATA_TO_PERSIST:-$MASTODON_ASSETS_DIR $MASTODON_SYSTEM_DIR}" -MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH:-"${AUTHORIZED_FETCH:-false}"}" -export MASTODON_AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH}" -export AUTHORIZED_FETCH="${MASTODON_AUTHORIZED_FETCH}" - -MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE="${LIMITED_FEDERATION_MODE:-false}"}" -export MASTODON_LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE}" -export LIMITED_FEDERATION_MODE="${MASTODON_LIMITED_FEDERATION_MODE}" - # Database configuration export MASTODON_MIGRATE_DATABASE="${MASTODON_MIGRATE_DATABASE:-true}" MASTODON_DATABASE_HOST="${MASTODON_DATABASE_HOST:-"${DB_HOST:-}"}" diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 3575bdf601a0..962541667fb5 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -104,8 +104,6 @@ docker-compose up mastodon |--------------------------------------|-------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------| | `MASTODON_MODE` | Mastodon service to run (can be web, streaming or sidekiq). | `web` | | `ALLOW_EMPTY_PASSWORD` | Allow an empty password. | `no` | -| `MASTODON_AUTHORIZED_FETCH` | Use ['secure mode'](https://docs.joinmastodon.org/admin/config/#authorized_fetch). | `false` | -| `MASTODON_LIMITED_FEDERATION_MODE` | Use an allow-list for federating with other servers. | `false` | | `MASTODON_CREATE_ADMIN` | Create admin for Mastodon. | `true` | | `MASTODON_ADMIN_USERNAME` | Mastodon admin username. | `user` | | `MASTODON_ADMIN_PASSWORD` | Mastodon admin password. | `bitnami1` |