Merge pull request #281 from linuxserver/3.23

Author: thespad

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.23
 
 # set version label
 ARG BUILD_DATE
@@ -17,21 +17,20 @@ RUN \
     fontconfig \
     mariadb-client \
     memcached \
-    php84-dom \
-    php84-exif \
-    php84-gd \
-    php84-ldap \
-    php84-mysqlnd \
-    php84-opcache \
-    php84-pdo_mysql \
-    php84-pecl-memcached \
-    php84-tokenizer \
+    php85-dom \
+    php85-exif \
+    php85-gd \
+    php85-ldap \
+    php85-mysqlnd \
+    php85-pdo_mysql \
+    php85-pecl-memcached \
+    php85-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
-  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.23
 
 # set version label
 ARG BUILD_DATE
@@ -17,21 +17,20 @@ RUN \
     fontconfig \
     mariadb-client \
     memcached \
-    php84-dom \
-    php84-exif \
-    php84-gd \
-    php84-ldap \
-    php84-mysqlnd \
-    php84-opcache \
-    php84-pdo_mysql \
-    php84-pecl-memcached \
-    php84-tokenizer \
+    php85-dom \
+    php85-exif \
+    php85-gd \
+    php85-ldap \
+    php85-mysqlnd \
+    php85-pdo_mysql \
+    php85-pecl-memcached \
+    php85-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
-  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \

README.md

@@ -343,6 +343,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.12.25:** - Rebase to Alpine 3.23.
 * **05.07.25:** - Rebase to Alpine 3.22.
 * **04.01.25:** - Add php-opcache.
 * **17.12.24:** - Rebase to Alpine 3.21.

readme-vars.yml

@@ -136,6 +136,7 @@ init_diagram: |
   "bookstack:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
   - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "04.01.25:", desc: "Add php-opcache."}
   - {date: "17.12.24:", desc: "Rebase to Alpine 3.21."}

root/init-hook

@@ -2,7 +2,7 @@
 # shellcheck shell=bash
 
 if [[ -n "${QUEUE_CONNECTION}" ]]; then
-  touch /etc/s6-overlay/s6-rc.d/user/contents.d/svc-queue-worker
+    touch /etc/s6-overlay/s6-rc.d/user/contents.d/svc-queue-worker
 fi
 
 exec \