Rebase against current master branch

Author: thespad

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -53,7 +53,6 @@ body:
       options:
         - x86-64
         - arm64
-        - armhf
     validations:
       required: true
   - type: textarea

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -9,36 +9,28 @@ ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
-# package versions
+# package versions
 ARG BOOKSTACK_RELEASE
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    composer && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     fontconfig \
     mariadb-client \
     memcached \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-gd \
-    php81-iconv \
-    php81-ldap \
-    php81-mysqlnd \
-    php81-pdo_mysql \
-    php81-pecl-memcached \
-    php81-phar \
-    php81-tokenizer \
-    php81-zip \
+    php82-dom \
+    php82-gd \
+    php82-ldap \
+    php82-mysqlnd \
+    php82-pdo_mysql \
+    php82-pecl-memcached \
+    php82-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \
@@ -55,11 +47,10 @@ RUN \
   echo "**** install composer dependencies ****" && \
   composer install -d /app/www/ && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
-    /root/.composer \
-    /tmp/*
+    /tmp/* \
+    $HOME/.cache \
+    $HOME/.composer
 
 # copy local files
 COPY root/ /

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -9,36 +9,28 @@ ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
-# package versions
+# package versions
 ARG BOOKSTACK_RELEASE
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    composer && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     fontconfig \
     mariadb-client \
     memcached \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-gd \
-    php81-iconv \
-    php81-ldap \
-    php81-mysqlnd \
-    php81-pdo_mysql \
-    php81-pecl-memcached \
-    php81-phar \
-    php81-tokenizer \
-    php81-zip \
+    php82-dom \
+    php82-gd \
+    php82-ldap \
+    php82-mysqlnd \
+    php82-pdo_mysql \
+    php82-pecl-memcached \
+    php82-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \
@@ -55,11 +47,10 @@ RUN \
   echo "**** install composer dependencies ****" && \
   composer install -d /app/www/ && \
   echo "**** cleanup ****" && \
-  apk del --purge \
-    build-dependencies && \
   rm -rf \
-    /root/.composer \
-    /tmp/*
+    /tmp/* \
+    $HOME/.cache \
+    $HOME/.composer
 
 # copy local files
 COPY root/ /