Rebase to 3.24

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.24
 
 ARG BUILD_DATE
 ARG VERSION
@@ -14,14 +14,14 @@ RUN \
   apk add --no-cache \
     iputils \
     grep \
-    php84-gd \
-    php84-intl \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pecl-redis \
-    php84-tokenizer \
-    php84-xmlreader \
+    php85-gd \
+    php85-intl \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pecl-redis \
+    php85-tokenizer \
+    php85-xmlreader \
     postgresql16-client \
     ssmtp && \
   apk add --no-cache --virtual=build-dependencies \
@@ -39,9 +39,9 @@ RUN \
     /tmp/speedtest-cli.tgz -C \
     /usr/bin && \
   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 "*** install speedtest-tracker ***" && \
   if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
     SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
@@ -65,12 +65,12 @@ RUN \
   echo "**** setup php opcache ****" && \
   { \
     echo 'opcache.enable_cli=1'; \
-  } > /etc/php84/conf.d/opcache-recommended.ini; \
+  } > /etc/php85/conf.d/opcache-recommended.ini; \
   { \
     echo 'post_max_size = 100M'; \
     echo 'upload_max_filesize = 100M'; \
     echo 'variables_order = EGPCS'; \
-  } > /etc/php84/conf.d/php-misc.ini && \
+  } > /etc/php85/conf.d/php-misc.ini && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge build-dependencies && \

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.24
 
 ARG BUILD_DATE
 ARG VERSION
@@ -14,14 +14,14 @@ RUN \
   apk add --no-cache \
     iputils \
     grep \
-    php84-gd \
-    php84-intl \
-    php84-pdo_mysql \
-    php84-pdo_pgsql \
-    php84-pdo_sqlite \
-    php84-pecl-redis \
-    php84-tokenizer \
-    php84-xmlreader \
+    php85-gd \
+    php85-intl \
+    php85-pdo_mysql \
+    php85-pdo_pgsql \
+    php85-pdo_sqlite \
+    php85-pecl-redis \
+    php85-tokenizer \
+    php85-xmlreader \
     postgresql16-client \
     ssmtp && \
   apk add --no-cache --virtual=build-dependencies \
@@ -39,9 +39,9 @@ RUN \
     /tmp/speedtest-cli.tgz -C \
     /usr/bin && \
   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 "*** install speedtest-tracker ***" && \
   if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
     SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
@@ -65,12 +65,12 @@ RUN \
   echo "**** setup php opcache ****" && \
   { \
     echo 'opcache.enable_cli=1'; \
-  } > /etc/php84/conf.d/opcache-recommended.ini; \
+  } > /etc/php85/conf.d/opcache-recommended.ini; \
   { \
     echo 'post_max_size = 100M'; \
     echo 'upload_max_filesize = 100M'; \
     echo 'variables_order = EGPCS'; \
-  } > /etc/php84/conf.d/php-misc.ini && \
+  } > /etc/php85/conf.d/php-misc.ini && \
   printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge build-dependencies && \

README.md

@@ -310,6 +310,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.07.26:** - Rebase to Alpine 3.24.
 * **11.10.25:** - Update nginx configs for v1.7.2. Existing users should update their nginx confs to avoid errors.
 * **05.07.25:** - Rebase to Alpine 3.22.
 * **20.12.24:** - Rebase to Alpine 3.21.

readme-vars.yml

@@ -97,6 +97,7 @@ init_diagram: |
   "speedtest-tracker:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "05.07.26:", desc: "Rebase to Alpine 3.24."}
   - {date: "11.10.25:", desc: "Update nginx configs for v1.7.2. Existing users should update their nginx confs to avoid errors."}
   - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
   - {date: "20.12.24:", desc: "Rebase to Alpine 3.21."}

root/etc/s6-overlay/s6-rc.d/init-speedtest-tracker-config/run

@@ -21,7 +21,7 @@ if [[ "${DB_CONNECTION:=sqlite}" = "sqlite" ]]; then
         lsiown abc:abc /app/www/database/database.sqlite
     fi
     export DB_CONNECTION=sqlite
-    echo "sqlite" > /run/s6/container_environment/DB_CONNECTION
+    printf '%s' "sqlite" > /run/s6/container_environment/DB_CONNECTION
 elif [[ "${DB_CONNECTION}" = "mysql" ]]; then
     echo "Waiting for DB to be available"
     END=$((SECONDS + 30))