Skip to content

Commit f47502c

Browse files
committed
Rebase to 3.21, swap imagemagick for vips
1 parent d45c170 commit f47502c

12 files changed

Lines changed: 11 additions & 9 deletions

.editorconfig

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/permissions.yml

100755100644
File mode changed.

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -17,13 +17,13 @@ RUN \
1717
apk add --no-cache \
1818
ffmpeg \
1919
file \
20-
imagemagick \
2120
libpq \
2221
libidn \
2322
nodejs \
2423
ruby \
2524
ruby-bundler \
2625
ruby-rdoc \
26+
vips \
2727
yaml && \
2828
apk add --no-cache --virtual=build-dependencies \
2929
build-base \
@@ -36,6 +36,7 @@ RUN \
3636
npm \
3737
openssl-dev \
3838
ruby-dev \
39+
vips-dev \
3940
yaml-dev && \
4041
echo "**** install mastodon ****" && \
4142
mkdir -p /app/www && \

Dockerfile.aarch64

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -18,13 +18,13 @@ RUN \
1818
ffmpeg \
1919
file \
2020
gcompat \
21-
imagemagick \
2221
libpq \
2322
libidn \
2423
nodejs \
2524
ruby \
2625
ruby-bundler \
2726
ruby-rdoc \
27+
vips \
2828
yaml && \
2929
apk add --no-cache --virtual=build-dependencies \
3030
build-base \
@@ -38,6 +38,7 @@ RUN \
3838
openssl-dev \
3939
python3-dev \
4040
ruby-dev \
41+
vips-dev \
4142
yaml-dev && \
4243
echo "**** install mastodon ****" && \
4344
mkdir -p /app/www && \

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ pipeline {
597597
--label \"org.opencontainers.image.title=Mastodon\" \
598598
--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.. \" \
599599
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
600-
--provenance=false --sbom=false --builder=default --load \
600+
--provenance=true --sbom=true --builder=default --load \
601601
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
602602
sh '''#! /bin/bash
603603
set -e
@@ -663,7 +663,7 @@ pipeline {
663663
--label \"org.opencontainers.image.title=Mastodon\" \
664664
--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.. \" \
665665
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
666-
--provenance=false --sbom=false --builder=default --load \
666+
--provenance=true --sbom=true --builder=default --load \
667667
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
668668
sh '''#! /bin/bash
669669
set -e
@@ -722,7 +722,7 @@ pipeline {
722722
--label \"org.opencontainers.image.title=Mastodon\" \
723723
--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.. \" \
724724
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
725-
--provenance=false --sbom=false --builder=default --load \
725+
--provenance=true --sbom=true --builder=default --load \
726726
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
727727
sh '''#! /bin/bash
728728
set -e

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
432432

433433
## Versions
434434

435+
* **06.06.25:** - Rebase to Alpine 3.21, replace deprecated imagemagick with vips.
435436
* **08.10.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.
436437
* **21.09.23:** - Rebase to Alpine 3.18, migrate to s6v3.
437438
* **25.05.23:** - Adjust apk flags.

0 commit comments

Comments
 (0)