From 2904fa92fb4f4d7a9156684e8e7629cfbb196b48 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 28 Dec 2025 17:06:20 +0000 Subject: [PATCH 1/2] Rebase to 3.23 --- Dockerfile | 26 +++++++++++++------------- Dockerfile.aarch64 | 26 +++++++++++++------------- README.md | 1 + readme-vars.yml | 1 + root/init-hook | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 19033ef..6da6db8 100644 --- a/Dockerfile +++ b/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,21 @@ 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-opcache \ + 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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6d0874b..e7bfb0b 100644 --- a/Dockerfile.aarch64 +++ b/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,21 @@ 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-opcache \ + 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 && \ diff --git a/README.md b/README.md index 99d1715..91a8273 100644 --- a/README.md +++ b/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. diff --git a/readme-vars.yml b/readme-vars.yml index b1a5438..275327b 100644 --- a/readme-vars.yml +++ b/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."} diff --git a/root/init-hook b/root/init-hook index 906cefc..c793f56 100755 --- a/root/init-hook +++ b/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 \ From ca7fcb276f2ef25fa14051469603678cb8eb6cc7 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 28 Dec 2025 17:09:44 +0000 Subject: [PATCH 2/2] opcache is now builtin --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6da6db8..4590976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,6 @@ RUN \ php85-gd \ php85-ldap \ php85-mysqlnd \ - php85-opcache \ php85-pdo_mysql \ php85-pecl-memcached \ php85-tokenizer \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e7bfb0b..2033c6f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,7 +22,6 @@ RUN \ php85-gd \ php85-ldap \ php85-mysqlnd \ - php85-opcache \ php85-pdo_mysql \ php85-pecl-memcached \ php85-tokenizer \