Rebase to 3.22 (develop)

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
 
 ARG BUILD_DATE
 ARG VERSION
@@ -17,13 +17,13 @@ RUN \
   apk add --no-cache \
     ffmpeg \
     file \
-    imagemagick \
     libpq \
     libidn \
     nodejs \
     ruby \
     ruby-bundler \
     ruby-rdoc \
+    vips \
     yaml && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
@@ -36,6 +36,7 @@ RUN \
     npm \
     openssl-dev \
     ruby-dev \
+    vips-dev \
     yaml-dev && \
   echo "**** install mastodon ****" && \
   mkdir -p /app/www && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
 
 ARG BUILD_DATE
 ARG VERSION
@@ -18,13 +18,13 @@ RUN \
     ffmpeg \
     file \
     gcompat \
-    imagemagick \
     libpq \
     libidn \
     nodejs \
     ruby \
     ruby-bundler \
     ruby-rdoc \
+    vips \
     yaml && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
@@ -38,6 +38,7 @@ RUN \
     openssl-dev \
     python3-dev \
     ruby-dev \
+    vips-dev \
     yaml-dev && \
   echo "**** install mastodon ****" && \
   mkdir -p /app/www && \

Jenkinsfile

@@ -592,7 +592,7 @@ pipeline {
           --label \"org.opencontainers.image.title=Mastodon\" \
           --label \"org.opencontainers.image.description=[Mastodon](https://github.com/mastodon/mastodon/) is a free, open-source social network server based on ActivityPub where users can follow friends and discover new ones..  \" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=false --sbom=false --builder=default --load \
+          --provenance=true --sbom=true --builder=default --load \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
         sh '''#! /bin/bash
               set -e
@@ -658,7 +658,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Mastodon\" \
               --label \"org.opencontainers.image.description=[Mastodon](https://github.com/mastodon/mastodon/) is a free, open-source social network server based on ActivityPub where users can follow friends and discover new ones..  \" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=false --sbom=false --builder=default --load \
+              --provenance=true --sbom=true --builder=default --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e
@@ -717,7 +717,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Mastodon\" \
               --label \"org.opencontainers.image.description=[Mastodon](https://github.com/mastodon/mastodon/) is a free, open-source social network server based on ActivityPub where users can follow friends and discover new ones..  \" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=false --sbom=false --builder=default --load \
+              --provenance=true --sbom=true --builder=default --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e

README.md

@@ -432,6 +432,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.06.25:** - Rebase to Alpine 3.22.
 * **26.08.24:** - Rebase to Alpine 3.20, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files). Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **08.08.23:** - Rebase to Alpine 3.18, migrate to s6v3
 * **09.02.23:** - Add Glitch branch.

jenkins-vars.yml

@@ -6,8 +6,6 @@ external_type: custom_json
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
-image_provenance: false
-image_sbom: false
 image_builder: default
 repo_vars:
   - JSON_URL='https://api.github.com/repos/mastodon/mastodon/releases'

readme-vars.yml

@@ -171,6 +171,7 @@ init_diagram: |
   "mastodon:develop" <- Base Images
 # changelog
 changelogs:
+  - {date: "04.06.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "26.08.24:", desc: "Rebase to Alpine 3.20, enable [Active Record Encryption](https://github.com/mastodon/mastodon/pull/29831/files). Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "08.08.23:", desc: "Rebase to Alpine 3.18, migrate to s6v3"}
   - {date: "09.02.23:", desc: "Add Glitch branch."}