Compare commits

..

No commits in common. "master" and "v25.12-ls237" have entirely different histories.

9 changed files with 195 additions and 198 deletions

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.23 FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -17,20 +17,21 @@ RUN \
fontconfig \ fontconfig \
mariadb-client \ mariadb-client \
memcached \ memcached \
php85-dom \ php84-dom \
php85-exif \ php84-exif \
php85-gd \ php84-gd \
php85-ldap \ php84-ldap \
php85-mysqlnd \ php84-mysqlnd \
php85-pdo_mysql \ php84-opcache \
php85-pecl-memcached \ php84-pdo_mysql \
php85-tokenizer \ php84-pecl-memcached \
php84-tokenizer \
qt5-qtbase \ qt5-qtbase \
ttf-freefont && \ ttf-freefont && \
echo "**** configure php-fpm to pass env vars ****" && \ echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/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 && \ 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/php85/php-fpm.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
echo "**** fetch bookstack ****" && \ echo "**** fetch bookstack ****" && \
mkdir -p\ mkdir -p\
/app/www && \ /app/www && \
@ -49,8 +50,8 @@ RUN \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** create symlinks ****" && \ echo "**** create symlinks ****" && \
/bin/bash -c \ /bin/bash -c \
'dst=(www/themes www/files www/images www/uploads backups www/framework/cache www/framework/sessions www/framework/views www/framework/purifier log/bookstack/laravel.log www/.env); \ 'dst=(www/themes www/files www/images www/uploads backups www/framework/cache www/framework/sessions www/framework/views log/bookstack/laravel.log www/.env); \
src=(themes storage/uploads/files storage/uploads/images public/uploads storage/backups storage/framework/cache storage/framework/sessions storage/framework/views storage/framework/purifier storage/logs/laravel.log .env); \ src=(themes storage/uploads/files storage/uploads/images public/uploads storage/backups storage/framework/cache storage/framework/sessions storage/framework/views storage/logs/laravel.log .env); \
for i in "${!src[@]}"; do rm -rf /app/www/"${src[i]}" && ln -s /config/"${dst[i]}" /app/www/"${src[i]}"; done' && \ for i in "${!src[@]}"; do rm -rf /app/www/"${src[i]}" && ln -s /config/"${dst[i]}" /app/www/"${src[i]}"; done' && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.23 FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -17,20 +17,21 @@ RUN \
fontconfig \ fontconfig \
mariadb-client \ mariadb-client \
memcached \ memcached \
php85-dom \ php84-dom \
php85-exif \ php84-exif \
php85-gd \ php84-gd \
php85-ldap \ php84-ldap \
php85-mysqlnd \ php84-mysqlnd \
php85-pdo_mysql \ php84-opcache \
php85-pecl-memcached \ php84-pdo_mysql \
php85-tokenizer \ php84-pecl-memcached \
php84-tokenizer \
qt5-qtbase \ qt5-qtbase \
ttf-freefont && \ ttf-freefont && \
echo "**** configure php-fpm to pass env vars ****" && \ echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/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 && \ 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/php85/php-fpm.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
echo "**** fetch bookstack ****" && \ echo "**** fetch bookstack ****" && \
mkdir -p\ mkdir -p\
/app/www && \ /app/www && \
@ -49,8 +50,8 @@ RUN \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** create symlinks ****" && \ echo "**** create symlinks ****" && \
/bin/bash -c \ /bin/bash -c \
'dst=(www/themes www/files www/images www/uploads backups www/framework/cache www/framework/sessions www/framework/views www/framework/purifier log/bookstack/laravel.log www/.env); \ 'dst=(www/themes www/files www/images www/uploads backups www/framework/cache www/framework/sessions www/framework/views log/bookstack/laravel.log www/.env); \
src=(themes storage/uploads/files storage/uploads/images public/uploads storage/backups storage/framework/cache storage/framework/sessions storage/framework/views storage/framework/purifier storage/logs/laravel.log .env); \ src=(themes storage/uploads/files storage/uploads/images public/uploads storage/backups storage/framework/cache storage/framework/sessions storage/framework/views storage/logs/laravel.log .env); \
for i in "${!src[@]}"; do rm -rf /app/www/"${src[i]}" && ln -s /config/"${dst[i]}" /app/www/"${src[i]}"; done' && \ for i in "${!src[@]}"; do rm -rf /app/www/"${src[i]}" && ln -s /config/"${dst[i]}" /app/www/"${src[i]}"; done' && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \

2
Jenkinsfile vendored
View File

@ -293,7 +293,7 @@ pipeline {
-v ${WORKSPACE}:/mnt \ -v ${WORKSPACE}:/mnt \
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
apk add --no-cache python3 && \ apk add --no-cache python3 && \
python3 -m venv /lsiopy && \ python3 -m venv /lsiopy && \
pip install --no-cache-dir -U pip && \ pip install --no-cache-dir -U pip && \

View File

@ -109,7 +109,7 @@ This image can be run with a read-only container filesystem. For details please
To help you get started creating a container from this image you can either use docker-compose or the docker cli. To help you get started creating a container from this image you can either use docker-compose or the docker cli.
>[!NOTE] >[!NOTE]
>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided. >Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
@ -343,7 +343,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **28.12.25:** - Rebase to Alpine 3.23.
* **05.07.25:** - Rebase to Alpine 3.22. * **05.07.25:** - Rebase to Alpine 3.22.
* **04.01.25:** - Add php-opcache. * **04.01.25:** - Add php-opcache.
* **17.12.24:** - Rebase to Alpine 3.21. * **17.12.24:** - Rebase to Alpine 3.21.

View File

@ -1,211 +1,210 @@
NAME VERSION TYPE NAME VERSION TYPE
Hidden Input 1, 0, 0, 0 binary Hidden Input 1, 0, 0, 0 binary
acl-libs 2.3.2-r1 apk acl-libs 2.3.2-r1 apk
alpine-baselayout 3.7.1-r8 apk alpine-baselayout 3.7.0-r0 apk
alpine-baselayout-data 3.7.1-r8 apk alpine-baselayout-data 3.7.0-r0 apk
alpine-keys 2.6-r0 apk alpine-keys 2.5-r0 apk
alpine-release 3.23.3-r0 apk alpine-release 3.22.2-r0 apk
aom-libs 3.13.1-r1 apk aom-libs 3.12.1-r0 apk
apache2-utils 2.4.66-r0 apk apache2-utils 2.4.66-r0 apk
apk-tools 3.0.4-r0 apk apk-tools 2.14.9-r3 apk
apr 1.7.6-r0 apk apr 1.7.5-r0 apk
apr-util 1.6.3-r2 apk apr-util 1.6.3-r1 apk
argon2-libs 20190702-r5 apk argon2-libs 20190702-r5 apk
aws/aws-crt-php v1.2.7 php-composer aws/aws-crt-php v1.2.7 php-composer
aws/aws-sdk-php 3.369.36 php-composer aws/aws-sdk-php 3.369.2 php-composer
bacon/bacon-qr-code v3.0.3 php-composer bacon/bacon-qr-code v3.0.3 php-composer
bash 5.3.3-r1 apk bash 5.2.37-r0 apk
brick/math 0.14.8 php-composer brick/math 0.14.1 php-composer
brotli-libs 1.2.0-r0 apk brotli-libs 1.1.0-r2 apk
busybox 1.37.0-r30 apk busybox 1.37.0-r20 apk
busybox-binsh 1.37.0-r30 apk busybox-binsh 1.37.0-r20 apk
c-ares 1.34.6-r0 apk c-ares 1.34.6-r0 apk
ca-certificates 20251003-r0 apk ca-certificates 20250911-r0 apk
ca-certificates-bundle 20251003-r0 apk ca-certificates-bundle 20250911-r0 apk
carbonphp/carbon-doctrine-types 3.2.0 php-composer carbonphp/carbon-doctrine-types 3.2.0 php-composer
catatonit 0.2.1-r0 apk catatonit 0.2.1-r0 apk
composer 2.9.5 binary composer 2.9.2 binary
coreutils 9.8-r1 apk coreutils 9.7-r1 apk
coreutils-env 9.8-r1 apk coreutils-env 9.7-r1 apk
coreutils-fmt 9.8-r1 apk coreutils-fmt 9.7-r1 apk
coreutils-sha512sum 9.8-r1 apk coreutils-sha512sum 9.7-r1 apk
curl 8.17.0-r1 apk curl 8.14.1-r2 apk
dasprid/enum 1.0.7 php-composer dasprid/enum 1.0.7 php-composer
dbus-libs 1.16.2-r1 apk dbus-libs 1.16.2-r1 apk
dflydev/dot-access-data v3.0.3 php-composer dflydev/dot-access-data v3.0.3 php-composer
doctrine/inflector 2.1.0 php-composer doctrine/inflector 2.1.0 php-composer
doctrine/lexer 3.0.1 php-composer doctrine/lexer 3.0.1 php-composer
dompdf/dompdf v3.1.4 php-composer dompdf/dompdf v3.1.4 php-composer
dompdf/php-font-lib 1.0.2 php-composer dompdf/php-font-lib 1.0.1 php-composer
dompdf/php-svg-lib 1.0.2 php-composer dompdf/php-svg-lib 1.0.0 php-composer
dragonmantank/cron-expression v3.6.0 php-composer dragonmantank/cron-expression v3.6.0 php-composer
egulias/email-validator 4.0.4 php-composer egulias/email-validator 4.0.4 php-composer
encodings 1.1.0-r0 apk encodings 1.0.7-r1 apk
ezyang/htmlpurifier v4.19.0 php-composer
fakerphp/faker v1.24.1 php-composer fakerphp/faker v1.24.1 php-composer
filp/whoops 2.18.4 php-composer filp/whoops 2.18.4 php-composer
findutils 4.10.0-r0 apk findutils 4.10.0-r0 apk
firebase/php-jwt v7.0.2 php-composer firebase/php-jwt v6.11.1 php-composer
font-freefont 20120503-r4 apk font-freefont 20120503-r4 apk
fontconfig 2.17.1-r0 apk fontconfig 2.15.0-r3 apk
freetype 2.14.1-r0 apk freetype 2.13.3-r0 apk
fruitcake/php-cors v1.4.0 php-composer fruitcake/php-cors v1.4.0 php-composer
gdbm 1.26-r0 apk gdbm 1.24-r0 apk
git 2.52.0-r0 apk git 2.49.1-r0 apk
git-init-template 2.52.0-r0 apk git-init-template 2.49.1-r0 apk
glib 2.86.3-r0 apk glib 2.84.4-r0 apk
graham-campbell/result-type v1.1.4 php-composer graham-campbell/result-type v1.1.3 php-composer
guzzlehttp/guzzle 7.10.0 php-composer guzzlehttp/guzzle 7.10.0 php-composer
guzzlehttp/promises 2.3.0 php-composer guzzlehttp/promises 2.3.0 php-composer
guzzlehttp/psr7 2.8.0 php-composer guzzlehttp/psr7 2.8.0 php-composer
guzzlehttp/uri-template v1.0.5 php-composer guzzlehttp/uri-template v1.0.5 php-composer
hamcrest/hamcrest-php v2.1.1 php-composer hamcrest/hamcrest-php v2.1.1 php-composer
iamcal/sql-parser v0.7 php-composer iamcal/sql-parser v0.6 php-composer
icu-data-full 76.1-r1 apk icu-data-full 76.1-r1 apk
icu-libs 76.1-r1 apk icu-libs 76.1-r1 apk
intervention/gif 4.2.4 php-composer intervention/gif 4.2.2 php-composer
intervention/image 3.11.6 php-composer intervention/image 3.11.6 php-composer
itsgoingd/clockwork v5.3.5 php-composer itsgoingd/clockwork v5.3.5 php-composer
jq 1.8.1-r0 apk jq 1.8.1-r0 apk
knplabs/knp-snappy v1.6.0 php-composer knplabs/knp-snappy v1.5.1 php-composer
larastan/larastan v3.9.2 php-composer larastan/larastan v3.8.1 php-composer
laravel/framework v12.52.0 php-composer laravel/framework v12.44.0 php-composer
laravel/prompts v0.3.13 php-composer laravel/prompts v0.3.8 php-composer
laravel/serializable-closure v2.0.9 php-composer laravel/serializable-closure v2.0.7 php-composer
laravel/socialite v5.24.2 php-composer laravel/socialite v5.24.0 php-composer
laravel/tinker v2.11.1 php-composer laravel/tinker v2.10.2 php-composer
league/commonmark 2.8.0 php-composer league/commonmark 2.8.0 php-composer
league/config v1.2.0 php-composer league/config v1.2.0 php-composer
league/flysystem 3.31.0 php-composer league/flysystem 3.30.2 php-composer
league/flysystem-aws-s3-v3 3.31.0 php-composer league/flysystem-aws-s3-v3 3.30.1 php-composer
league/flysystem-local 3.31.0 php-composer league/flysystem-local 3.30.2 php-composer
league/html-to-markdown 5.1.1 php-composer league/html-to-markdown 5.1.1 php-composer
league/mime-type-detection 1.16.0 php-composer league/mime-type-detection 1.16.0 php-composer
league/oauth1-client v1.11.0 php-composer league/oauth1-client v1.11.0 php-composer
league/oauth2-client 2.9.0 php-composer league/oauth2-client 2.9.0 php-composer
league/uri 7.8.0 php-composer league/uri 7.7.0 php-composer
league/uri-interfaces 7.8.0 php-composer league/uri-interfaces 7.7.0 php-composer
libapk 3.0.4-r0 apk libapk2 2.14.9-r3 apk
libattr 2.5.2-r2 apk libattr 2.5.2-r2 apk
libavif 1.3.0-r0 apk libavif 1.3.0-r0 apk
libblkid 2.41.2-r0 apk libblkid 2.41-r9 apk
libbsd 0.12.2-r0 apk libbsd 0.12.2-r0 apk
libbz2 1.0.8-r6 apk libbz2 1.0.8-r6 apk
libcrypto3 3.5.5-r0 apk libcrypto3 3.5.4-r0 apk
libcurl 8.17.0-r1 apk libcurl 8.14.1-r2 apk
libdav1d 1.5.2-r0 apk libdav1d 1.5.1-r0 apk
libeconf 0.8.3-r0 apk libeconf 0.6.3-r0 apk
libedit 20251016.3.1-r0 apk libedit 20250104.3.1-r1 apk
libevent 2.1.12-r8 apk libevent 2.1.12-r8 apk
libexpat 2.7.4-r0 apk libexpat 2.7.3-r0 apk
libffi 3.5.2-r0 apk libffi 3.4.8-r0 apk
libfontenc 1.1.8-r0 apk libfontenc 1.1.8-r0 apk
libgcc 15.2.0-r2 apk libgcc 14.2.0-r6 apk
libice 1.1.2-r0 apk libice 1.1.2-r0 apk
libidn2 2.3.8-r0 apk libidn2 2.3.7-r0 apk
libintl 0.24.1-r1 apk libintl 0.24.1-r0 apk
libjpeg-turbo 3.1.2-r0 apk libjpeg-turbo 3.1.0-r0 apk
libldap 2.6.10-r0 apk libldap 2.6.8-r0 apk
libmd 1.1.0-r0 apk libmd 1.1.0-r0 apk
libmemcached-libs 1.1.4-r1 apk libmemcached-libs 1.1.4-r1 apk
libmount 2.41.2-r0 apk libmount 2.41-r9 apk
libncursesw 6.5_p20251123-r0 apk libncursesw 6.5_p20250503-r0 apk
libpcre2-16 10.47-r0 apk libpcre2-16 10.46-r0 apk
libpng 1.6.54-r0 apk libpng 1.6.53-r0 apk
libproc2 4.0.5-r0 apk libproc2 4.0.4-r3 apk
libpsl 0.21.5-r3 apk libpsl 0.21.5-r3 apk
libsasl 2.1.28-r9 apk libsasl 2.1.28-r8 apk
libseccomp 2.6.0-r1 apk libseccomp 2.6.0-r0 apk
libsharpyuv 1.6.0-r0 apk libsharpyuv 1.5.0-r0 apk
libsm 1.2.6-r0 apk libsm 1.2.5-r0 apk
libssl3 3.5.5-r0 apk libssl3 3.5.4-r0 apk
libstdc++ 15.2.0-r2 apk libstdc++ 14.2.0-r6 apk
libunistring 1.4.1-r0 apk libunistring 1.3-r0 apk
libuuid 2.41.2-r0 apk libuuid 2.41-r9 apk
libwebp 1.6.0-r0 apk libwebp 1.5.0-r0 apk
libx11 1.8.12-r1 apk libx11 1.8.11-r0 apk
libxau 1.0.12-r0 apk libxau 1.0.12-r0 apk
libxcb 1.17.0-r1 apk libxcb 1.17.0-r0 apk
libxdmcp 1.1.5-r1 apk libxdmcp 1.1.5-r1 apk
libxext 1.3.6-r2 apk libxext 1.3.6-r2 apk
libxml2 2.13.9-r0 apk libxml2 2.13.9-r0 apk
libxpm 3.5.17-r0 apk libxpm 3.5.17-r0 apk
libxt 1.3.1-r0 apk libxt 1.3.1-r0 apk
libyuv 0.0.1887.20251502-r1 apk libyuv 0.0.1887.20251502-r1 apk
libzip 1.11.4-r1 apk libzip 1.11.4-r0 apk
linux-pam 1.7.1-r2 apk linux-pam 1.7.0-r4 apk
logrotate 3.22.0-r0 apk logrotate 3.21.0-r1 apk
mariadb-client 11.4.9-r0 apk mariadb-client 11.4.8-r0 apk
mariadb-common 11.4.9-r0 apk mariadb-common 11.4.8-r0 apk
masterminds/html5 2.10.0 php-composer masterminds/html5 2.10.0 php-composer
memcached 1.6.39-r0 apk memcached 1.6.32-r0 apk
mkfontscale 1.2.3-r1 apk mkfontscale 1.2.3-r1 apk
mockery/mockery 1.6.12 php-composer mockery/mockery 1.6.12 php-composer
monolog/monolog 3.10.0 php-composer monolog/monolog 3.9.0 php-composer
mtdowling/jmespath.php 2.8.0 php-composer mtdowling/jmespath.php 2.8.0 php-composer
musl 1.2.5-r21 apk musl 1.2.5-r10 apk
musl-utils 1.2.5-r21 apk musl-utils 1.2.5-r10 apk
myclabs/deep-copy 1.13.4 php-composer myclabs/deep-copy 1.13.4 php-composer
nano 8.7-r0 apk nano 8.4-r0 apk
ncurses-terminfo-base 6.5_p20251123-r0 apk ncurses-terminfo-base 6.5_p20250503-r0 apk
nesbot/carbon 3.11.1 php-composer nesbot/carbon 3.11.0 php-composer
netcat-openbsd 1.234.1-r0 apk netcat-openbsd 1.229.1-r0 apk
nette/schema v1.3.4 php-composer nette/schema v1.3.3 php-composer
nette/utils v4.1.3 php-composer nette/utils v4.1.1 php-composer
nghttp2-libs 1.68.0-r0 apk nghttp2-libs 1.65.0-r0 apk
nghttp3 1.13.1-r0 apk nginx 1.28.0-r3 apk
nginx 1.28.2-r0 apk
nikic/php-parser v5.7.0 php-composer nikic/php-parser v5.7.0 php-composer
nunomaduro/collision v8.9.1 php-composer nunomaduro/collision v8.8.3 php-composer
nunomaduro/termwind v2.4.0 php-composer nunomaduro/termwind v2.3.3 php-composer
onelogin/php-saml 4.3.1 php-composer onelogin/php-saml 4.3.1 php-composer
oniguruma 6.9.10-r0 apk oniguruma 6.9.10-r0 apk
openssl 3.5.5-r0 apk openssl 3.5.4-r0 apk
paragonie/constant_time_encoding v3.1.3 php-composer paragonie/constant_time_encoding v3.1.3 php-composer
paragonie/random_compat v9.99.100 php-composer paragonie/random_compat v9.99.100 php-composer
pcre2 10.47-r0 apk pcre2 10.46-r0 apk
phar-io/manifest 2.0.4 php-composer phar-io/manifest 2.0.4 php-composer
phar-io/version 3.2.1 php-composer phar-io/version 3.2.1 php-composer
php85 8.5.2-r0 apk php84 8.4.16-r0 apk
php85-common 8.5.2-r0 apk php84-common 8.4.16-r0 apk
php85-ctype 8.5.2-r0 apk php84-ctype 8.4.16-r0 apk
php85-curl 8.5.2-r0 apk php84-curl 8.4.16-r0 apk
php85-dom 8.5.2-r0 apk php84-dom 8.4.16-r0 apk
php85-exif 8.5.2-r0 apk php84-exif 8.4.16-r0 apk
php85-fileinfo 8.5.2-r0 apk php84-fileinfo 8.4.16-r0 apk
php85-fpm 8.5.2-r0 apk php84-fpm 8.4.16-r0 apk
php85-gd 8.5.2-r0 apk php84-gd 8.4.16-r0 apk
php85-iconv 8.5.2-r0 apk php84-iconv 8.4.16-r0 apk
php85-ldap 8.5.2-r0 apk php84-ldap 8.4.16-r0 apk
php85-mbstring 8.5.2-r0 apk php84-mbstring 8.4.16-r0 apk
php85-mysqlnd 8.5.2-r0 apk php84-mysqlnd 8.4.16-r0 apk
php85-openssl 8.5.2-r0 apk php84-opcache 8.4.16-r0 apk
php85-pdo 8.5.2-r0 apk php84-openssl 8.4.16-r0 apk
php85-pdo_mysql 8.5.2-r0 apk php84-pdo 8.4.16-r0 apk
php85-pecl-igbinary 3.2.17_rc1-r0 apk php84-pdo_mysql 8.4.16-r0 apk
php85-pecl-memcached 3.4.0-r0 apk php84-pecl-igbinary 3.2.16-r1 apk
php85-pecl-msgpack 3.0.0-r0 apk php84-pecl-memcached 3.3.0-r0 apk
php85-phar 8.5.2-r0 apk php84-pecl-msgpack 3.0.0-r0 apk
php85-session 8.5.2-r0 apk php84-phar 8.4.16-r0 apk
php85-simplexml 8.5.2-r0 apk php84-session 8.4.16-r0 apk
php85-sockets 8.5.2-r0 apk php84-simplexml 8.4.16-r0 apk
php85-tokenizer 8.5.2-r0 apk php84-sockets 8.4.16-r0 apk
php85-xml 8.5.2-r0 apk php84-tokenizer 8.4.16-r0 apk
php85-xmlwriter 8.5.2-r0 apk php84-xml 8.4.16-r0 apk
php85-zip 8.5.2-r0 apk php84-xmlwriter 8.4.16-r0 apk
phpoption/phpoption 1.9.5 php-composer php84-zip 8.4.16-r0 apk
phpseclib/phpseclib 3.0.49 php-composer phpoption/phpoption 1.9.4 php-composer
phpstan/phpstan 2.1.39 php-composer phpseclib/phpseclib 3.0.48 php-composer
phpstan/phpstan 2.1.33 php-composer
phpunit/php-code-coverage 11.0.12 php-composer phpunit/php-code-coverage 11.0.12 php-composer
phpunit/php-file-iterator 5.1.1 php-composer phpunit/php-file-iterator 5.1.0 php-composer
phpunit/php-invoker 5.0.1 php-composer phpunit/php-invoker 5.0.1 php-composer
phpunit/php-text-template 4.0.1 php-composer phpunit/php-text-template 4.0.1 php-composer
phpunit/php-timer 7.0.1 php-composer phpunit/php-timer 7.0.1 php-composer
phpunit/phpunit 11.5.55 php-composer phpunit/phpunit 11.5.46 php-composer
popt 1.19-r4 apk popt 1.19-r4 apk
pragmarx/google2fa v9.0.0 php-composer pragmarx/google2fa v9.0.0 php-composer
predis/predis v3.4.0 php-composer predis/predis v3.3.0 php-composer
procps-ng 4.0.5-r0 apk procps-ng 4.0.4-r3 apk
psr/clock 1.0.0 php-composer psr/clock 1.0.0 php-composer
psr/container 2.0.2 php-composer psr/container 2.0.2 php-composer
psr/event-dispatcher 1.0.0 php-composer psr/event-dispatcher 1.0.0 php-composer
@ -214,19 +213,19 @@ psr/http-factory 1.1.0 php-composer
psr/http-message 2.0 php-composer psr/http-message 2.0 php-composer
psr/log 3.0.2 php-composer psr/log 3.0.2 php-composer
psr/simple-cache 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer
psy/psysh v0.12.20 php-composer psy/psysh v0.12.18 php-composer
qt5-qtbase 5.15.10_git20230714-r4 apk qt5-qtbase 5.15.10_git20230714-r4 apk
ralouphie/getallheaders 3.0.3 php-composer ralouphie/getallheaders 3.0.3 php-composer
ramsey/collection 2.1.1 php-composer ramsey/collection 2.1.1 php-composer
ramsey/uuid 4.9.2 php-composer ramsey/uuid 4.9.2 php-composer
readline 8.3.1-r0 apk readline 8.2.13-r1 apk
robrichards/xmlseclibs 3.1.4 php-composer robrichards/xmlseclibs 3.1.4 php-composer
sabberworm/php-css-parser v9.1.0 php-composer sabberworm/php-css-parser v8.9.0 php-composer
scanelf 1.3.8-r2 apk scanelf 1.3.8-r1 apk
sebastian/cli-parser 3.0.2 php-composer sebastian/cli-parser 3.0.2 php-composer
sebastian/code-unit 3.0.3 php-composer sebastian/code-unit 3.0.3 php-composer
sebastian/code-unit-reverse-lookup 4.0.1 php-composer sebastian/code-unit-reverse-lookup 4.0.1 php-composer
sebastian/comparator 6.3.3 php-composer sebastian/comparator 6.3.2 php-composer
sebastian/complexity 4.0.1 php-composer sebastian/complexity 4.0.1 php-composer
sebastian/diff 6.0.2 php-composer sebastian/diff 6.0.2 php-composer
sebastian/environment 7.2.1 php-composer sebastian/environment 7.2.1 php-composer
@ -238,7 +237,7 @@ sebastian/object-reflector 4.0.1 php-composer
sebastian/recursion-context 6.0.3 php-composer sebastian/recursion-context 6.0.3 php-composer
sebastian/type 5.1.3 php-composer sebastian/type 5.1.3 php-composer
sebastian/version 5.0.2 php-composer sebastian/version 5.0.2 php-composer
shadow 4.18.0-r0 apk shadow 4.17.3-r0 apk
skalibs-libs 2.14.4.0-r0 apk skalibs-libs 2.14.4.0-r0 apk
socialiteproviders/discord 4.2.0 php-composer socialiteproviders/discord 4.2.0 php-composer
socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer
@ -249,22 +248,22 @@ socialiteproviders/twitch 5.4.0 php-composer
squizlabs/php_codesniffer 4.0.1 php-composer squizlabs/php_codesniffer 4.0.1 php-composer
ssddanbrown/asserthtml v3.1.0 php-composer ssddanbrown/asserthtml v3.1.0 php-composer
ssddanbrown/htmldiff v2.0.0 php-composer ssddanbrown/htmldiff v2.0.0 php-composer
ssl_client 1.37.0-r30 apk ssl_client 1.37.0-r20 apk
staabm/side-effects-detector 1.0.5 php-composer staabm/side-effects-detector 1.0.5 php-composer
symfony/clock v7.4.0 php-composer symfony/clock v7.4.0 php-composer
symfony/console v7.4.4 php-composer symfony/console v7.4.1 php-composer
symfony/css-selector v7.4.0 php-composer symfony/css-selector v7.4.0 php-composer
symfony/deprecation-contracts v3.6.0 php-composer symfony/deprecation-contracts v3.6.0 php-composer
symfony/dom-crawler v7.4.4 php-composer symfony/dom-crawler v7.4.1 php-composer
symfony/error-handler v7.4.4 php-composer symfony/error-handler v7.4.0 php-composer
symfony/event-dispatcher v7.4.4 php-composer symfony/event-dispatcher v7.4.0 php-composer
symfony/event-dispatcher-contracts v3.6.0 php-composer symfony/event-dispatcher-contracts v3.6.0 php-composer
symfony/filesystem v7.4.0 php-composer symfony/filesystem v7.4.0 php-composer
symfony/finder v7.4.5 php-composer symfony/finder v7.4.0 php-composer
symfony/http-foundation v7.4.5 php-composer symfony/http-foundation v7.4.1 php-composer
symfony/http-kernel v7.4.5 php-composer symfony/http-kernel v7.4.2 php-composer
symfony/mailer v7.4.4 php-composer symfony/mailer v7.4.0 php-composer
symfony/mime v7.4.5 php-composer symfony/mime v7.4.0 php-composer
symfony/polyfill-ctype v1.33.0 php-composer symfony/polyfill-ctype v1.33.0 php-composer
symfony/polyfill-intl-grapheme v1.33.0 php-composer symfony/polyfill-intl-grapheme v1.33.0 php-composer
symfony/polyfill-intl-idn v1.33.0 php-composer symfony/polyfill-intl-idn v1.33.0 php-composer
@ -275,22 +274,20 @@ symfony/polyfill-php83 v1.33.0 php-composer
symfony/polyfill-php84 v1.33.0 php-composer symfony/polyfill-php84 v1.33.0 php-composer
symfony/polyfill-php85 v1.33.0 php-composer symfony/polyfill-php85 v1.33.0 php-composer
symfony/polyfill-uuid v1.33.0 php-composer symfony/polyfill-uuid v1.33.0 php-composer
symfony/process v7.4.5 php-composer symfony/process v7.4.0 php-composer
symfony/routing v7.4.4 php-composer symfony/routing v7.4.0 php-composer
symfony/service-contracts v3.6.1 php-composer symfony/service-contracts v3.6.1 php-composer
symfony/string v7.4.4 php-composer symfony/string v7.4.0 php-composer
symfony/translation v7.4.4 php-composer symfony/translation v7.4.0 php-composer
symfony/translation-contracts v3.6.1 php-composer symfony/translation-contracts v3.6.1 php-composer
symfony/uid v7.4.4 php-composer symfony/uid v7.4.0 php-composer
symfony/var-dumper v7.4.4 php-composer symfony/var-dumper v7.4.0 php-composer
thecodingmachine/safe v3.4.0 php-composer
theseer/tokenizer 1.3.1 php-composer theseer/tokenizer 1.3.1 php-composer
tijsverkoyen/css-to-inline-styles v2.4.0 php-composer tijsverkoyen/css-to-inline-styles v2.4.0 php-composer
tzdata 2025c-r0 apk tzdata 2025c-r0 apk
utmps-libs 0.1.3.1-r0 apk utmps-libs 0.1.3.1-r0 apk
vlucas/phpdotenv v5.6.3 php-composer vlucas/phpdotenv v5.6.2 php-composer
voku/portable-ascii 2.0.3 php-composer voku/portable-ascii 2.0.3 php-composer
xemlock/htmlpurifier-html5 v0.1.12 php-composer xz-libs 5.8.1-r0 apk
xz-libs 5.8.2-r0 apk
zlib 1.3.1-r2 apk zlib 1.3.1-r2 apk
zstd-libs 1.5.7-r2 apk zstd-libs 1.5.7-r0 apk

View File

@ -131,12 +131,11 @@ init_diagram: |
svc-queue-worker -> legacy-services svc-queue-worker -> legacy-services
} }
Base Images: { Base Images: {
"baseimage-alpine-nginx:3.23" <- "baseimage-alpine:3.23" "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22"
} }
"bookstack:latest" <- Base Images "bookstack:latest" <- Base Images
# changelog # changelog
changelogs: changelogs:
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
- {date: "05.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
- {date: "04.01.25:", desc: "Add php-opcache."} - {date: "04.01.25:", desc: "Add php-opcache."}
- {date: "17.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "17.12.24:", desc: "Rebase to Alpine 3.21."}

View File

@ -6,4 +6,4 @@ mkdir -p \
touch /config/log/bookstack/laravel.log touch /config/log/bookstack/laravel.log
php /app/www/artisan key:generate --show --no-ansi php /app/www/artisan key:generate --show

View File

@ -4,12 +4,12 @@
# create directory structure # create directory structure
mkdir -p \ mkdir -p \
/config/www/{uploads,files,images,themes} \ /config/www/{uploads,files,images,themes} \
/config/www/framework/{cache,sessions,views,purifier} \ /config/www/framework/{cache,sessions,views} \
/config/backups \ /config/backups \
/config/log/bookstack /config/log/bookstack
if [[ ! -f /tmp/dbwait.lock ]];then if [[ ! -f /tmp/dbwait.lock ]];then
rm -rf /config/www/framework/{cache,sessions,views,purifier}/* rm -rf /config/www/framework/{cache,sessions,views}/*
fi fi
# check for .env and copy default if needed # check for .env and copy default if needed