From 8508908a80939f62237ec39d477d4aa1da409bcd Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 17 Jul 2025 14:45:27 +0200 Subject: [PATCH] [bitnami/mastodon] Release 4.4.1-debian-12-r0 (#83552) Signed-off-by: Bitnami Bot --- bitnami/mastodon/4/debian-12/Dockerfile | 13 +++++++------ .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../rootfs/opt/bitnami/scripts/libmastodon.sh | 2 ++ .../rootfs/opt/bitnami/scripts/mastodon-env.sh | 2 ++ bitnami/mastodon/README.md | 1 + 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/bitnami/mastodon/4/debian-12/Dockerfile b/bitnami/mastodon/4/debian-12/Dockerfile index ac8c4bb63ee3..c86d82a629e9 100644 --- a/bitnami/mastodon/4/debian-12/Dockerfile +++ b/bitnami/mastodon/4/debian-12/Dockerfile @@ -8,13 +8,13 @@ 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-07-17T08:30:36Z" \ + org.opencontainers.image.created="2025-07-17T12:07:00Z" \ 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" \ org.opencontainers.image.title="mastodon" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="4.3.9" + org.opencontainers.image.version="4.4.1" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -24,7 +24,7 @@ ENV HOME="/" \ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies -RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libbrotli1 libbsd0 libbz2-1.0 libcom-err2 libcrypt1 libcurl4 libedit2 libffi8 libgcc-s1 libgmp10 libgnutls30 libgssapi-krb5-2 libhogweed6 libicu72 libidn12 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.5-0 liblz4-1 liblzma5 libmd0 libncursesw6 libnettle8 libnghttp2-14 libp11-kit0 libpcre2-8-0 libpq5 libpsl5 libreadline-dev libreadline8 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl-dev libssl3 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libyaml-0-2 libyaml-dev libzstd1 procps zlib1g +RUN install_packages acl ca-certificates curl ffmpeg file imagemagick libblkid1 libbrotli1 libbsd0 libbz2-1.0 libcairo-gobject2 libcairo2 libcom-err2 libcrypt1 libcurl4 libdatrie1 libdeflate0 libedit2 libexif-dev libexif12 libexpat1 libffi8 libfftw3-double3 libfontconfig1 libfreetype6 libfribidi0 libgcc-s1 libgdk-pixbuf-2.0-0 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgraphite2-3 libgssapi-krb5-2 libharfbuzz0b libhogweed6 libicu72 libidn12 libidn2-0 libimath-3-1-29 libjbig0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.5-0 liblerc4 liblqr-1-0 libltdl7 liblz4-1 liblzma5 libmagickcore-6.q16-6 libmd0 libmount1 libncursesw6 libnettle8 libnghttp2-14 libopenexr-3-1-30 libopenexr-dev libopenjp2-7 libp11-kit0 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpcre2-8-0 libpixman-1-0 libpng16-16 libpq5 libpsl5 libreadline-dev libreadline8 librsvg2-2 librtmp1 libsasl2-2 libselinux1 libsqlite3-0 libssh2-1 libssl-dev libssl3 libstdc++6 libtasn1-6 libthai0 libtiff6 libtinfo6 libunistring2 libuuid1 libwebp7 libwebpdemux2 libwebpmux3 libx11-6 libxau6 libxcb-render0 libxcb-shm0 libxcb1 libxdmcp6 libxext6 libxml2 libxrender1 libxslt1.1 libyaml-0-2 libyaml-dev libzstd1 procps zlib1g 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 ; \ @@ -35,7 +35,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ "redis-client-8.0.3-1-linux-${OS_ARCH}-debian-12" \ "postgresql-client-17.5.0-1-linux-${OS_ARCH}-debian-12" \ "node-22.17.1-0-linux-${OS_ARCH}-debian-12" \ - "mastodon-4.3.9-0-linux-${OS_ARCH}-debian-12" \ + "mastodon-4.4.1-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -53,9 +53,10 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/mastodon/postunpack.sh -ENV APP_VERSION="4.3.9" \ +ENV APP_VERSION="4.4.1" \ BITNAMI_APP_NAME="mastodon" \ - 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:$PATH" + 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" EXPOSE 3000 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 b2afaa190f36..50e905d3ca05 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.3.9-0" + "version": "4.4.1-0" }, "node": { "arch": "amd64", diff --git a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh index c32d5fc96d66..c64a8f2c260c 100644 --- a/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh +++ b/bitnami/mastodon/4/debian-12/rootfs/opt/bitnami/scripts/libmastodon.sh @@ -419,6 +419,8 @@ mastodon_initialize() { local -r psql_connection_string="postgresql://${MASTODON_DATABASE_USERNAME}:${MASTODON_DATABASE_PASSWORD}@${MASTODON_DATABASE_HOST}:${MASTODON_DATABASE_PORT_NUMBER}/${MASTODON_DATABASE_NAME}" mastodon_wait_for_postgresql_connection "$psql_connection_string" if is_boolean_yes "$MASTODON_MIGRATE_DATABASE"; then + info "Preparing database" + mastodon_rake_execute db:prepare info "Migrating database" mastodon_rake_execute db:migrate fi 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 998a55cffa9a..5669b41add80 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 @@ -47,6 +47,7 @@ mastodon_env_vars=( RAILS_SERVE_STATIC_FILES MASTODON_BIND_ADDRESS MASTODON_DATA_TO_PERSIST + MASTODON_USE_LIBVIPS MASTODON_MIGRATE_DATABASE MASTODON_DATABASE_HOST MASTODON_DATABASE_PORT_NUMBER @@ -178,6 +179,7 @@ export MASTODON_BIND_ADDRESS="${MASTODON_BIND_ADDRESS:-0.0.0.0}" 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}" +export MASTODON_USE_LIBVIPS="${MASTODON_USE_LIBVIPS:-true}" # Database configuration export MASTODON_MIGRATE_DATABASE="${MASTODON_MIGRATE_DATABASE:-true}" diff --git a/bitnami/mastodon/README.md b/bitnami/mastodon/README.md index 339b1523f744..9b8aff927ef2 100644 --- a/bitnami/mastodon/README.md +++ b/bitnami/mastodon/README.md @@ -136,6 +136,7 @@ docker-compose up mastodon | `RAILS_SERVE_STATIC_FILES` | Have puma server the static files in the public/ folder | `true` | | `MASTODON_BIND_ADDRESS` | Address to listen for interfaces | `0.0.0.0` | | `MASTODON_DATA_TO_PERSIST` | Data to persist from installations. | `$MASTODON_ASSETS_DIR $MASTODON_SYSTEM_DIR` | +| `MASTODON_USE_LIBVIPS` | Use libvips for image processing instead of ImageMagick. | `true` | | `MASTODON_MIGRATE_DATABASE` | Run rake db:migrate job. | `true` | | `MASTODON_DATABASE_HOST` | Database server host. | `postgresql` | | `MASTODON_DATABASE_PORT_NUMBER` | Database server port. | `5432` |