From b6c62bf543d30f87c0e56264f4d37b5f9e85641a Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 8 Jul 2025 19:19:01 +0100 Subject: [PATCH] Rebase to 3.22 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ab4f8e2..3642dda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 ARG BUILD_DATE ARG VERSION diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a81a273..b2b16e3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 ARG BUILD_DATE ARG VERSION diff --git a/README.md b/README.md index 0b52b1a..3b73e0a 100644 --- a/README.md +++ b/README.md @@ -429,6 +429,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.07.25:** - Rebase to Alpine 3.22. * **06.06.25:** - Rebase to Alpine 3.21, replace deprecated imagemagick with vips. * **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. * **21.09.23:** - Rebase to Alpine 3.18, migrate to s6v3. diff --git a/readme-vars.yml b/readme-vars.yml index f34707d..e973af8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -167,6 +167,7 @@ init_diagram: | "mastodon:latest" <- Base Images # changelog changelogs: + - {date: "08.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "06.06.25:", desc: "Rebase to Alpine 3.21, replace deprecated imagemagick with vips."} - {date: "08.10.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: "21.09.23:", desc: "Rebase to Alpine 3.18, migrate to s6v3."}