diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 index 2c30784..d07cf12 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -8,6 +8,9 @@ on: pull_request_review: types: [submitted,edited,dismissed] +permissions: + contents: read + jobs: manage-project: permissions: diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 index 2f54573..7b77919 --- a/.github/workflows/call_issues_cron.yml +++ b/.github/workflows/call_issues_cron.yml @@ -4,6 +4,9 @@ on: - cron: '3 9 * * *' workflow_dispatch: +permissions: + contents: read + jobs: stale: permissions: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 index ed71e16..ac0689e --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -3,6 +3,9 @@ name: External Trigger Main on: workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-master: runs-on: ubuntu-latest @@ -43,8 +46,8 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') + echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/bookstack" tag="latest" @@ -100,8 +103,8 @@ jobs: exit 1 fi echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY - if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY + if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then + echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY @@ -116,7 +119,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY - echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY + echo "New sanitized version \`${EXT_RELEASE_SANITIZED}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi @@ -136,7 +139,7 @@ jobs: --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ --data-urlencode "Submit=Submit" echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for bookstack tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + TRIGGER_REASON="A version change was detected for bookstack tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 index ae9393a..f8352de --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '19 * * * *' workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-scheduler: runs-on: ubuntu-latest diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 index 7ada469..a001e4b --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -2,8 +2,14 @@ name: Greetings on: [pull_request_target, issues] +permissions: + contents: read + jobs: greeting: + permissions: + issues: write + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/first-interaction@v1 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 index 7233671..3c6c519 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '4 18 * * 1' workflow_dispatch: +permissions: + contents: read + jobs: package-trigger-scheduler: runs-on: ubuntu-latest diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 3cb5246..19033ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 # set version label ARG BUILD_DATE @@ -17,21 +17,21 @@ RUN \ fontconfig \ mariadb-client \ memcached \ - php83-dom \ - php83-exif \ - php83-gd \ - php83-ldap \ - php83-mysqlnd \ - php83-opcache \ - php83-pdo_mysql \ - php83-pecl-memcached \ - php83-tokenizer \ + php84-dom \ + php84-exif \ + php84-gd \ + php84-ldap \ + php84-mysqlnd \ + php84-opcache \ + php84-pdo_mysql \ + php84-pecl-memcached \ + php84-tokenizer \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.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/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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a983af3..6d0874b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 # set version label ARG BUILD_DATE @@ -17,21 +17,21 @@ RUN \ fontconfig \ mariadb-client \ memcached \ - php83-dom \ - php83-exif \ - php83-gd \ - php83-ldap \ - php83-mysqlnd \ - php83-opcache \ - php83-pdo_mysql \ - php83-pecl-memcached \ - php83-tokenizer \ + php84-dom \ + php84-exif \ + php84-gd \ + php84-ldap \ + php84-mysqlnd \ + php84-opcache \ + php84-pdo_mysql \ + php84-pecl-memcached \ + php84-tokenizer \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.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/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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/Jenkinsfile b/Jenkinsfile index 4cbf23a..b9c7f89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,11 @@ pipeline { env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' + if ( env.SYFT_IMAGE_TAG == null ) { + env.SYFT_IMAGE_TAG = 'latest' + } } + echo "Using syft image tag ${SYFT_IMAGE_TAG}" sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ @@ -790,7 +794,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:latest \ + ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" @@ -900,6 +904,7 @@ pipeline { -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ + -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index 7ca0daf..99d1715 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") [![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") @@ -22,7 +21,6 @@ Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. -* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget @@ -58,7 +56,6 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\ | | arm64 | ✅ | arm64v8-\ | -| armhf | ❌ | | ## Application Setup @@ -346,6 +343,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.07.25:** - Rebase to Alpine 3.22. * **04.01.25:** - Add php-opcache. * **17.12.24:** - Rebase to Alpine 3.21. * **11.10.24:** - Default to environment config over .env file config. diff --git a/package_versions.txt b/package_versions.txt index e989bbf..9ad9ef4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,36 +1,37 @@ NAME VERSION TYPE +Hidden Input 1, 0, 0, 0 binary acl-libs 2.3.2-r1 apk -alpine-baselayout 3.6.8-r1 apk -alpine-baselayout-data 3.6.8-r1 apk +alpine-baselayout 3.7.0-r0 apk +alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.3-r0 apk -aom-libs 3.11.0-r0 apk -apache2-utils 2.4.62-r0 apk -apk-tools 2.14.6-r3 apk +alpine-release 3.22.0-r0 apk +aom-libs 3.12.1-r0 apk +apache2-utils 2.4.64-r0 apk +apk-tools 2.14.9-r2 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.7 php-composer -aws/aws-sdk-php 3.342.18 php-composer +aws/aws-sdk-php 3.349.2 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r12 apk -busybox-binsh 1.37.0-r12 apk -c-ares 1.34.3-r0 apk -ca-certificates 20241121-r1 apk -ca-certificates-bundle 20241121-r1 apk +busybox 1.37.0-r18 apk +busybox-binsh 1.37.0-r18 apk +c-ares 1.34.5-r0 apk +ca-certificates 20241121-r2 apk +ca-certificates-bundle 20241121-r2 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer -catatonit 0.2.0-r0 apk -composer 2.8.7 binary -coreutils 9.5-r2 apk -coreutils-env 9.5-r2 apk -coreutils-fmt 9.5-r2 apk -coreutils-sha512sum 9.5-r2 apk -curl 8.12.1-r1 apk +catatonit 0.2.1-r0 apk +composer 2.8.10 binary +coreutils 9.7-r1 apk +coreutils-env 9.7-r1 apk +coreutils-fmt 9.7-r1 apk +coreutils-sha512sum 9.7-r1 apk +curl 8.14.1-r1 apk dasprid/enum 1.0.6 php-composer -dbus-libs 1.14.10-r4 apk +dbus-libs 1.16.2-r1 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer @@ -41,168 +42,169 @@ dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.4 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer -filp/whoops 2.18.0 php-composer +filp/whoops 2.18.3 php-composer findutils 4.10.0-r0 apk -firebase/php-jwt v6.11.0 php-composer +firebase/php-jwt v6.11.1 php-composer font-freefont 20120503-r4 apk -fontconfig 2.15.0-r1 apk +fontconfig 2.15.0-r3 apk freetype 2.13.3-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.24-r0 apk -git 2.47.2-r0 apk -git-init-template 2.47.2-r0 apk -glib 2.82.5-r0 apk +git 2.49.1-r0 apk +git-init-template 2.49.1-r0 apk +glib 2.84.3-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.3 php-composer guzzlehttp/promises 2.2.0 php-composer guzzlehttp/psr7 2.7.1 php-composer guzzlehttp/uri-template v1.0.4 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -iamcal/sql-parser v0.5 php-composer -icu-data-full 74.2-r0 apk -icu-libs 74.2-r0 apk +hamcrest/hamcrest-php v2.1.1 php-composer +iamcal/sql-parser v0.6 php-composer +icu-data-full 76.1-r1 apk +icu-libs 76.1-r1 apk intervention/gif 4.2.2 php-composer -intervention/image 3.11.2 php-composer +intervention/image 3.11.3 php-composer itsgoingd/clockwork v5.3.4 php-composer -jq 1.7.1-r0 apk +jq 1.8.0-r0 apk knplabs/knp-snappy v1.5.1 php-composer -larastan/larastan v3.2.0 php-composer -laravel/framework v11.44.2 php-composer +larastan/larastan v3.5.0 php-composer +laravel/framework v11.45.1 php-composer laravel/prompts v0.3.5 php-composer laravel/serializable-closure v2.0.4 php-composer -laravel/socialite v5.19.0 php-composer +laravel/socialite v5.21.0 php-composer laravel/tinker v2.10.1 php-composer -league/commonmark 2.6.1 php-composer +league/commonmark 2.7.0 php-composer league/config v1.2.0 php-composer -league/flysystem 3.29.1 php-composer +league/flysystem 3.30.0 php-composer league/flysystem-aws-s3-v3 3.29.0 php-composer -league/flysystem-local 3.29.0 php-composer +league/flysystem-local 3.30.0 php-composer league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.16.0 php-composer league/oauth1-client v1.11.0 php-composer league/oauth2-client 2.8.1 php-composer league/uri 7.5.1 php-composer league/uri-interfaces 7.5.0 php-composer +libapk2 2.14.9-r2 apk libattr 2.5.2-r2 apk -libavif 1.0.4-r0 apk -libblkid 2.40.4-r0 apk +libavif 1.3.0-r0 apk +libblkid 2.41-r9 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r1 apk -libdav1d 1.5.0-r0 apk +libcrypto3 3.5.1-r0 apk +libcurl 8.14.1-r1 apk +libdav1d 1.5.1-r0 apk libeconf 0.6.3-r0 apk -libedit 20240808.3.1-r0 apk -libevent 2.1.12-r7 apk -libexpat 2.7.0-r0 apk -libffi 3.4.7-r0 apk +libedit 20250104.3.1-r1 apk +libevent 2.1.12-r8 apk +libexpat 2.7.1-r0 apk +libffi 3.4.8-r0 apk libfontenc 1.1.8-r0 apk -libgcc 14.2.0-r4 apk -libice 1.1.1-r6 apk +libgcc 14.2.0-r6 apk +libice 1.1.2-r0 apk libidn2 2.3.7-r0 apk -libintl 0.22.5-r0 apk -libjpeg-turbo 3.0.4-r0 apk +libintl 0.24.1-r0 apk +libjpeg-turbo 3.1.0-r0 apk libldap 2.6.8-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.40.4-r0 apk -libncursesw 6.5_p20241006-r3 apk -libpcre2-16 10.43-r0 apk +libmount 2.41-r9 apk +libncursesw 6.5_p20250503-r0 apk +libpcre2-16 10.43-r1 apk libpng 1.6.47-r0 apk -libproc2 4.0.4-r2 apk +libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsasl 2.1.28-r8 apk -libseccomp 2.5.5-r1 apk -libsharpyuv 1.4.0-r0 apk -libsm 1.2.4-r4 apk -libssl3 3.3.3-r0 apk -libstdc++ 14.2.0-r4 apk -libunistring 1.2-r0 apk -libuuid 2.40.4-r0 apk -libwebp 1.4.0-r0 apk -libx11 1.8.10-r0 apk -libxau 1.0.11-r4 apk -libxcb 1.16.1-r0 apk +libseccomp 2.6.0-r0 apk +libsharpyuv 1.5.0-r0 apk +libsm 1.2.5-r0 apk +libssl3 3.5.1-r0 apk +libstdc++ 14.2.0-r6 apk +libunistring 1.3-r0 apk +libuuid 2.41-r9 apk +libwebp 1.5.0-r0 apk +libx11 1.8.11-r0 apk +libxau 1.0.12-r0 apk +libxcb 1.17.0-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.13.4-r5 apk +libxml2 2.13.8-r0 apk libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk -libzip 1.11.2-r0 apk -linux-pam 1.6.1-r1 apk +libyuv 0.0.1887.20251502-r1 apk +libzip 1.11.4-r0 apk +linux-pam 1.7.0-r4 apk logrotate 3.21.0-r1 apk -mariadb-client 11.4.5-r0 apk -mariadb-common 11.4.5-r0 apk +mariadb-client 11.4.5-r2 apk +mariadb-common 11.4.5-r2 apk masterminds/html5 2.9.0 php-composer memcached 1.6.32-r0 apk mkfontscale 1.2.3-r1 apk mockery/mockery 1.6.12 php-composer monolog/monolog 3.9.0 php-composer mtdowling/jmespath.php 2.8.0 php-composer -musl 1.2.5-r9 apk -musl-utils 1.2.5-r9 apk -myclabs/deep-copy 1.13.0 php-composer -nano 8.2-r0 apk -ncurses-terminfo-base 6.5_p20241006-r3 apk -nesbot/carbon 3.9.0 php-composer -netcat-openbsd 1.226.1.1-r0 apk +musl 1.2.5-r10 apk +musl-utils 1.2.5-r10 apk +myclabs/deep-copy 1.13.3 php-composer +nano 8.4-r0 apk +ncurses-terminfo-base 6.5_p20250503-r0 apk +nesbot/carbon 3.10.1 php-composer +netcat-openbsd 1.229.1-r0 apk nette/schema v1.3.2 php-composer -nette/utils v4.0.6 php-composer -nghttp2-libs 1.64.0-r0 apk -nginx 1.26.3-r0 apk -nikic/php-parser v5.4.0 php-composer -nunomaduro/collision v8.7.0 php-composer -nunomaduro/termwind v2.3.0 php-composer -onelogin/php-saml 4.2.0 php-composer -oniguruma 6.9.9-r0 apk -openssl 3.3.3-r0 apk +nette/utils v4.0.7 php-composer +nghttp2-libs 1.65.0-r0 apk +nginx 1.28.0-r3 apk +nikic/php-parser v5.5.0 php-composer +nunomaduro/collision v8.8.2 php-composer +nunomaduro/termwind v2.3.1 php-composer +onelogin/php-saml 4.3.0 php-composer +oniguruma 6.9.10-r0 apk +openssl 3.5.1-r0 apk paragonie/constant_time_encoding v3.0.0 php-composer paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r3 apk -pcre2 10.43-r0 apk +pcre2 10.43-r1 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.19-r0 apk -php83-common 8.3.19-r0 apk -php83-ctype 8.3.19-r0 apk -php83-curl 8.3.19-r0 apk -php83-dom 8.3.19-r0 apk -php83-exif 8.3.19-r0 apk -php83-fileinfo 8.3.19-r0 apk -php83-fpm 8.3.19-r0 apk -php83-gd 8.3.19-r0 apk -php83-iconv 8.3.19-r0 apk -php83-ldap 8.3.19-r0 apk -php83-mbstring 8.3.19-r0 apk -php83-mysqlnd 8.3.19-r0 apk -php83-opcache 8.3.19-r0 apk -php83-openssl 8.3.19-r0 apk -php83-pdo 8.3.19-r0 apk -php83-pdo_mysql 8.3.19-r0 apk -php83-pecl-igbinary 3.2.16-r0 apk -php83-pecl-memcached 3.3.0-r0 apk -php83-pecl-msgpack 3.0.0-r0 apk -php83-phar 8.3.19-r0 apk -php83-session 8.3.19-r0 apk -php83-simplexml 8.3.19-r0 apk -php83-sockets 8.3.19-r0 apk -php83-tokenizer 8.3.19-r0 apk -php83-xml 8.3.19-r0 apk -php83-xmlwriter 8.3.19-r0 apk -php83-zip 8.3.19-r0 apk +php84 8.4.10-r0 apk +php84-common 8.4.10-r0 apk +php84-ctype 8.4.10-r0 apk +php84-curl 8.4.10-r0 apk +php84-dom 8.4.10-r0 apk +php84-exif 8.4.10-r0 apk +php84-fileinfo 8.4.10-r0 apk +php84-fpm 8.4.10-r0 apk +php84-gd 8.4.10-r0 apk +php84-iconv 8.4.10-r0 apk +php84-ldap 8.4.10-r0 apk +php84-mbstring 8.4.10-r0 apk +php84-mysqlnd 8.4.10-r0 apk +php84-opcache 8.4.10-r0 apk +php84-openssl 8.4.10-r0 apk +php84-pdo 8.4.10-r0 apk +php84-pdo_mysql 8.4.10-r0 apk +php84-pecl-igbinary 3.2.16-r1 apk +php84-pecl-memcached 3.3.0-r0 apk +php84-pecl-msgpack 3.0.0-r0 apk +php84-phar 8.4.10-r0 apk +php84-session 8.4.10-r0 apk +php84-simplexml 8.4.10-r0 apk +php84-sockets 8.4.10-r0 apk +php84-tokenizer 8.4.10-r0 apk +php84-xml 8.4.10-r0 apk +php84-xmlwriter 8.4.10-r0 apk +php84-zip 8.4.10-r0 apk phpoption/phpoption 1.9.3 php-composer -phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.11 php-composer -phpunit/php-code-coverage 11.0.9 php-composer +phpseclib/phpseclib 3.0.46 php-composer +phpstan/phpstan 2.1.17 php-composer +phpunit/php-code-coverage 11.0.10 php-composer phpunit/php-file-iterator 5.1.0 php-composer phpunit/php-invoker 5.0.1 php-composer phpunit/php-text-template 4.0.1 php-composer phpunit/php-timer 7.0.1 php-composer -phpunit/phpunit 11.5.15 php-composer +phpunit/phpunit 11.5.26 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer -predis/predis v2.3.0 php-composer -procps-ng 4.0.4-r2 apk +predis/predis v2.4.0 php-composer +procps-ng 4.0.4-r3 apk psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer @@ -211,12 +213,12 @@ psr/http-factory 1.1.0 php-composer psr/http-message 2.0 php-composer psr/log 3.0.2 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.12.8 php-composer -qt5-qtbase 5.15.10_git20230714-r3 apk +psy/psysh v0.12.9 php-composer +qt5-qtbase 5.15.10_git20230714-r4 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.1.1 php-composer -ramsey/uuid 4.7.6 php-composer -readline 8.2.13-r0 apk +ramsey/uuid 4.9.0 php-composer +readline 8.2.13-r1 apk robrichards/xmlseclibs 3.1.3 php-composer sabberworm/php-css-parser v8.8.0 php-composer scanelf 1.3.8-r1 apk @@ -226,7 +228,7 @@ sebastian/code-unit-reverse-lookup 4.0.1 php-composer sebastian/comparator 6.3.1 php-composer sebastian/complexity 4.0.1 php-composer sebastian/diff 6.0.2 php-composer -sebastian/environment 7.2.0 php-composer +sebastian/environment 7.2.1 php-composer sebastian/exporter 6.3.0 php-composer sebastian/global-state 7.0.2 php-composer sebastian/lines-of-code 3.0.1 php-composer @@ -235,55 +237,55 @@ sebastian/object-reflector 4.0.1 php-composer sebastian/recursion-context 6.0.2 php-composer sebastian/type 5.1.2 php-composer sebastian/version 5.0.2 php-composer -shadow 4.16.0-r1 apk -skalibs-libs 2.14.3.0-r0 apk +shadow 4.17.3-r0 apk +skalibs-libs 2.14.4.0-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.8.1 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer -socialiteproviders/okta 4.4.0 php-composer +socialiteproviders/okta 4.5.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.12.0 php-composer +squizlabs/php_codesniffer 3.13.2 php-composer ssddanbrown/asserthtml v3.1.0 php-composer -ssddanbrown/htmldiff v1.0.4 php-composer +ssddanbrown/htmldiff v2.0.0 php-composer ssddanbrown/symfony-mailer 7.2.x-dev php-composer -ssl_client 1.37.0-r12 apk +ssl_client 1.37.0-r18 apk staabm/side-effects-detector 1.0.5 php-composer -symfony/clock v7.2.0 php-composer -symfony/console v7.2.5 php-composer -symfony/css-selector v7.2.0 php-composer -symfony/deprecation-contracts v3.5.1 php-composer -symfony/dom-crawler v7.2.4 php-composer -symfony/error-handler v7.2.5 php-composer -symfony/event-dispatcher v7.2.0 php-composer -symfony/event-dispatcher-contracts v3.5.1 php-composer -symfony/finder v7.2.2 php-composer -symfony/http-foundation v7.2.5 php-composer -symfony/http-kernel v7.2.5 php-composer -symfony/mime v7.2.4 php-composer -symfony/polyfill-ctype v1.31.0 php-composer -symfony/polyfill-intl-grapheme v1.31.0 php-composer -symfony/polyfill-intl-idn v1.31.0 php-composer -symfony/polyfill-intl-normalizer v1.31.0 php-composer -symfony/polyfill-mbstring v1.31.0 php-composer -symfony/polyfill-php80 v1.31.0 php-composer -symfony/polyfill-php83 v1.31.0 php-composer -symfony/polyfill-uuid v1.31.0 php-composer -symfony/process v7.2.5 php-composer -symfony/routing v7.2.3 php-composer -symfony/service-contracts v3.5.1 php-composer -symfony/string v7.2.0 php-composer -symfony/translation v7.2.4 php-composer -symfony/translation-contracts v3.5.1 php-composer -symfony/uid v7.2.0 php-composer -symfony/var-dumper v7.2.3 php-composer +symfony/clock v7.3.0 php-composer +symfony/console v7.3.1 php-composer +symfony/css-selector v7.3.0 php-composer +symfony/deprecation-contracts v3.6.0 php-composer +symfony/dom-crawler v7.3.1 php-composer +symfony/error-handler v7.3.1 php-composer +symfony/event-dispatcher v7.3.0 php-composer +symfony/event-dispatcher-contracts v3.6.0 php-composer +symfony/finder v7.3.0 php-composer +symfony/http-foundation v7.3.1 php-composer +symfony/http-kernel v7.3.1 php-composer +symfony/mime v7.3.0 php-composer +symfony/polyfill-ctype v1.32.0 php-composer +symfony/polyfill-intl-grapheme v1.32.0 php-composer +symfony/polyfill-intl-idn v1.32.0 php-composer +symfony/polyfill-intl-normalizer v1.32.0 php-composer +symfony/polyfill-mbstring v1.32.0 php-composer +symfony/polyfill-php80 v1.32.0 php-composer +symfony/polyfill-php83 v1.32.0 php-composer +symfony/polyfill-uuid v1.32.0 php-composer +symfony/process v7.3.0 php-composer +symfony/routing v7.3.0 php-composer +symfony/service-contracts v3.6.0 php-composer +symfony/string v7.3.0 php-composer +symfony/translation v7.3.1 php-composer +symfony/translation-contracts v3.6.0 php-composer +symfony/uid v7.3.1 php-composer +symfony/var-dumper v7.3.1 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer tzdata 2025b-r0 apk -utmps-libs 0.1.2.3-r2 apk -vlucas/phpdotenv v5.6.1 php-composer +utmps-libs 0.1.3.1-r0 apk +vlucas/phpdotenv v5.6.2 php-composer voku/portable-ascii 2.0.3 php-composer webmozart/assert 1.11.0 php-composer -xz-libs 5.6.3-r0 apk +xz-libs 5.8.1-r0 apk zlib 1.3.1-r2 apk -zstd-libs 1.5.6-r2 apk +zstd-libs 1.5.7-r0 apk diff --git a/readme-vars.yml b/readme-vars.yml index cebfc8d..b1a5438 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ init_diagram: | init-crontab-config -> init-config-end init-config -> init-crontab-config init-mods-end -> init-custom-files + init-adduser -> init-device-perms base -> init-envfile init-os-end -> init-folders init-php -> init-keygen @@ -111,6 +112,7 @@ init_diagram: | init-samples -> init-nginx init-version-checks -> init-nginx-end init-adduser -> init-os-end + init-device-perms -> init-os-end init-envfile -> init-os-end init-keygen -> init-permissions init-nginx -> init-php @@ -129,11 +131,12 @@ init_diagram: | svc-queue-worker -> legacy-services } Base Images: { - "baseimage-alpine-nginx:3.21" <- "baseimage-alpine:3.21" + "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22" } "bookstack:latest" <- Base Images # changelog changelogs: + - {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."} - {date: "11.10.24:", desc: "Default to environment config over .env file config."} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy