Merge pull request #22 from linuxserver/3.21

Rebase to Alpine 3.21

Author: thespad

.github/workflows/external_trigger.yml

@@ -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.21
 
 # set version label
 ARG BUILD_DATE

Dockerfile

@@ -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.21
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.04.25:** - Rebase to Alpine 3.21.
 * **30.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **24.03.24:** - Added LDAP module to composer
 * **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.

README.md

@@ -157,6 +157,7 @@ init_diagram: |
   "kimai:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "06.04.25:", desc: "Rebase to Alpine 3.21."}
   - {date: "30.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "24.03.24:", desc: "Added LDAP module to composer"}
   - {date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}

readme-vars.yml

@@ -36,6 +36,11 @@ if [[ ! -L /app/www/config/packages/local.yaml ]]; then
     ln -s /config/local.yaml /app/www/config/packages/local.yaml
 fi
 
+# Clear cache on image upgade
+if [[ ! -f /dbwait.lock ]];then
+    rm -rf /config/www/var/cache/*
+fi
+
 DB_HOST=$(php -r 'echo parse_url(getenv("DATABASE_URL"), PHP_URL_HOST);')
 DB_PORT=$(php -r 'echo parse_url(getenv("DATABASE_URL"), PHP_URL_PORT) ?? 3306;')