Merge pull request #24 from linuxserver/3.22

Author: thespad

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
 
 # set version label
 ARG BUILD_DATE
@@ -12,18 +12,18 @@ LABEL maintainer="nemchik"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-pdo_mysql \
-    php83-pecl-redis \
-    php83-tokenizer \
-    php83-xmlreader \
-    php83-xsl && \
+    php84-gd \
+    php84-intl \
+    php84-ldap \
+    php84-pdo_mysql \
+    php84-pecl-redis \
+    php84-tokenizer \
+    php84-xmlreader \
+    php84-xsl && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** install kimai ****" && \
   mkdir -p\
     /app/www && \

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
 
 # set version label
 ARG BUILD_DATE
@@ -12,18 +12,18 @@ LABEL maintainer="nemchik"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-gd \
-    php83-intl \
-    php83-ldap \
-    php83-pdo_mysql \
-    php83-pecl-redis \
-    php83-tokenizer \
-    php83-xmlreader \
-    php83-xsl && \
+    php84-gd \
+    php84-intl \
+    php84-ldap \
+    php84-pdo_mysql \
+    php84-pecl-redis \
+    php84-tokenizer \
+    php84-xmlreader \
+    php84-xsl && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** install kimai ****" && \
   mkdir -p\
     /app/www && \

README.md

@@ -347,6 +347,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **04.07.25:** - Rebase to Alpine 3.22.
 * **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

readme-vars.yml

@@ -157,6 +157,7 @@ init_diagram: |
   "kimai:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "04.07.25:", desc: "Rebase to Alpine 3.22."}
   - {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"}