From 7a6592ca1a10e11a1b1c356660e41006d8010b35 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 11 May 2020 18:58:20 +0000 Subject: [PATCH 001/452] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1d14e2f..78a057d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -41,7 +41,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r0 libcap-2.27-r0 -libcrypto1.1-1.1.1d-r3 +libcrypto1.1-1.1.1g-r0 libcurl-7.67.0-r0 libdrm-2.4.100-r0 libedit-20191211.3.1-r0 @@ -56,7 +56,7 @@ libice-1.0.10-r0 libinput-libs-1.14.3-r0 libintl-0.20.1-r2 libjpeg-turbo-2.0.4-r0 -libldap-2.4.48-r1 +libldap-2.4.48-r2 libmagic-5.37-r1 libmemcached-libs-1.0.18-r4 libmount-2.34-r1 @@ -69,7 +69,7 @@ libressl3.0-libssl-3.0.2-r0 libsasl-2.1.27-r5 libseccomp-2.4.2-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1d-r3 +libssl1.1-1.1.1g-r0 libstdc++-9.2.0-r4 libtasn1-4.15.0-r0 libtheora-1.1.1-r14 @@ -89,7 +89,7 @@ libxfixes-5.0.3-r2 libxft-2.3.3-r0 libxkbcommon-0.9.1-r0 libxkbcommon-x11-0.9.1-r0 -libxml2-2.9.10-r2 +libxml2-2.9.10-r3 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r0 @@ -110,8 +110,8 @@ mtdev-1.1.5-r2 musl-1.1.24-r2 musl-utils-1.1.24-r2 nano-4.6-r0 -ncurses-libs-6.1_p20200118-r3 -ncurses-terminfo-base-6.1_p20200118-r3 +ncurses-libs-6.1_p20200118-r4 +ncurses-terminfo-base-6.1_p20200118-r4 netcat-openbsd-1.130-r1 nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 @@ -157,12 +157,12 @@ qt5-qtwebkit-5.9.1-r7 readline-8.0.1-r0 scanelf-1.2.4-r0 shadow-4.7-r1 -sqlite-libs-3.30.1-r1 +sqlite-libs-3.30.1-r2 ssl_client-1.31.1-r9 tar-1.32-r1 tidyhtml-libs-5.6.0-r0 ttf-freefont-20120503-r1 -tzdata-2019c-r0 +tzdata-2020a-r0 wayland-libs-client-1.17.0-r0 wayland-libs-egl-1.17.0-r0 wayland-libs-server-1.17.0-r0 From d5d65fdaad38273bee41dbd492222f89c1a20a10 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 18 May 2020 19:05:33 +0000 Subject: [PATCH 002/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 78a057d..d4ab547 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -125,26 +125,26 @@ pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.17-r0 php7-common-7.3.17-r0 -php7-ctype-7.3.17-r0 -php7-curl-7.3.17-r0 -php7-dom-7.3.17-r0 +php7-ctype-7.3.18-r0 +php7-curl-7.3.18-r0 +php7-dom-7.3.18-r0 php7-fileinfo-7.3.17-r0 php7-fpm-7.3.17-r0 -php7-gd-7.3.17-r0 +php7-gd-7.3.18-r0 php7-json-7.3.17-r0 -php7-ldap-7.3.17-r0 +php7-ldap-7.3.18-r0 php7-mbstring-7.3.17-r0 -php7-mysqlnd-7.3.17-r0 +php7-mysqlnd-7.3.18-r0 php7-openssl-7.3.17-r0 -php7-pdo-7.3.17-r0 -php7-pdo_mysql-7.3.17-r0 +php7-pdo-7.3.18-r0 +php7-pdo_mysql-7.3.18-r0 php7-pecl-igbinary-3.0.1-r1 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.17-r0 +php7-phar-7.3.18-r0 php7-session-7.3.17-r0 php7-simplexml-7.3.17-r0 -php7-tidy-7.3.17-r0 -php7-tokenizer-7.3.17-r0 +php7-tidy-7.3.18-r0 +php7-tokenizer-7.3.18-r0 php7-xml-7.3.17-r0 php7-xmlwriter-7.3.17-r0 pixman-0.38.4-r0 From e73081ab9a33cc6ea7d3d8ca386001c7bbea611b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 25 May 2020 19:04:25 +0000 Subject: [PATCH 003/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d4ab547..537cd2d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -123,30 +123,30 @@ p11-kit-0.23.18.1-r0 pango-1.44.7-r0 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.17-r0 -php7-common-7.3.17-r0 +php7-7.3.18-r0 +php7-common-7.3.18-r0 php7-ctype-7.3.18-r0 php7-curl-7.3.18-r0 php7-dom-7.3.18-r0 -php7-fileinfo-7.3.17-r0 -php7-fpm-7.3.17-r0 +php7-fileinfo-7.3.18-r0 +php7-fpm-7.3.18-r0 php7-gd-7.3.18-r0 -php7-json-7.3.17-r0 +php7-json-7.3.18-r0 php7-ldap-7.3.18-r0 -php7-mbstring-7.3.17-r0 +php7-mbstring-7.3.18-r0 php7-mysqlnd-7.3.18-r0 -php7-openssl-7.3.17-r0 +php7-openssl-7.3.18-r0 php7-pdo-7.3.18-r0 php7-pdo_mysql-7.3.18-r0 php7-pecl-igbinary-3.0.1-r1 php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.18-r0 -php7-session-7.3.17-r0 -php7-simplexml-7.3.17-r0 +php7-session-7.3.18-r0 +php7-simplexml-7.3.18-r0 php7-tidy-7.3.18-r0 php7-tokenizer-7.3.18-r0 -php7-xml-7.3.17-r0 -php7-xmlwriter-7.3.17-r0 +php7-xml-7.3.18-r0 +php7-xmlwriter-7.3.18-r0 pixman-0.38.4-r0 popt-1.16-r7 qt5-qtbase-5.12.5-r0 From 602352ebb66965ab840f2f5cc4ffe15843eb93f0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 1 Jun 2020 18:51:49 +0000 Subject: [PATCH 004/452] Bot Updating Templated Files --- Jenkinsfile | 53 +++++++++++++++++------------------------------------ README.md | 40 ++++++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 54 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ed25d0b..d6ed6b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -138,7 +138,6 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -159,7 +158,6 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -180,7 +178,6 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { @@ -545,22 +542,15 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:latest @@ -569,7 +559,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:latest || : @@ -591,18 +581,11 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' - ], - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' ] ]) { retry(5) { sh '''#! /bin/bash set -e - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin @@ -636,26 +619,24 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done - for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest - docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG} - docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest - docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest - docker push ${LEGACYIMAGE}:amd64-${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-${META_TAG} - docker push ${LEGACYIMAGE}:arm64v8-${META_TAG} - docker push ${LEGACYIMAGE}:latest - docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest - done + docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:amd64-${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} + docker push ${GITHUBIMAGE}:latest + docker push ${GITHUBIMAGE}:${META_TAG} + docker push ${GITHUBIMAGE}:arm32v7-latest + docker push ${GITHUBIMAGE}:arm64v8-latest ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ diff --git a/README.md b/README.md index 040b392..8482909 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) -[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&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?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") -[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&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?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.") -[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") +[![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://discord.gg/YWrKVTn "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") The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: @@ -25,16 +25,15 @@ Find us at: # [linuxserver/bookstack](https://github.com/linuxserver/docker-bookstack) -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-bookstack/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-bookstack/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bookstack) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bookstack) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/bookstack) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) -[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-bookstack/container_registry) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) +[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fbookstack%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html) [Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. @@ -143,7 +142,7 @@ Container images are configured using parameters passed at runtime (such as thos ## Environment variables from files (Docker secrets) -You can set any environment variable from a file by using a special prepend `FILE__`. +You can set any environment variable from a file by using a special prepend `FILE__`. As an example: @@ -153,6 +152,11 @@ As an example: Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +## Umask for running applications + +For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting. +Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support. + ## User / Group Identifiers When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. @@ -192,7 +196,7 @@ The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/ ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. From 8932c2a2b1fc6183974be47044d6a39f8b4fe427 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 1 Jun 2020 19:05:20 +0000 Subject: [PATCH 005/452] Bot Updating Package Versions --- package_versions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package_versions.txt b/package_versions.txt index 537cd2d..688e6f1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -64,6 +64,7 @@ libogg-1.3.4-r0 libpciaccess-0.16-r0 libpcre2-16-10.34-r1 libpng-1.6.37-r1 +libproc-3.3.16-r0 libressl3.0-libcrypto-3.0.2-r0 libressl3.0-libssl-3.0.2-r0 libsasl-2.1.27-r5 @@ -149,6 +150,7 @@ php7-xml-7.3.18-r0 php7-xmlwriter-7.3.18-r0 pixman-0.38.4-r0 popt-1.16-r7 +procps-3.3.16-r0 qt5-qtbase-5.12.5-r0 qt5-qtbase-x11-5.12.5-r0 qt5-qtdeclarative-5.12.5-r0 From 5475fd091af2a2e4b333058bc74e7ccdad190d41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Jun 2020 14:51:58 -0400 Subject: [PATCH 006/452] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8482909..ce3daa5 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fbookstack%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fbookstack%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html) [Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. From 4b3cef3284679b9599be965af59e1020b13a2c76 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 8 Jun 2020 19:06:47 +0000 Subject: [PATCH 007/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 688e6f1..187e0db 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ coreutils-8.31-r0 cups-libs-2.2.12-r1 curl-7.67.0-r0 db-5.3.28-r1 -dbus-libs-1.12.16-r2 +dbus-libs-1.12.16-r3 encodings-1.0.5-r0 eudev-libs-3.2.9-r1 expat-2.2.9-r1 From 2b3f19a00a48db220972368920306305e97780f4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 15 Jun 2020 18:57:51 +0000 Subject: [PATCH 008/452] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 187e0db..b904558 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,8 +9,8 @@ argon2-libs-20190702-r1 avahi-libs-0.7-r4 bash-5.0.11-r1 busybox-1.31.1-r9 -ca-certificates-20191127-r1 -ca-certificates-cacert-20191127-r1 +ca-certificates-20191127-r2 +ca-certificates-cacert-20191127-r2 cairo-1.16.0-r2 cdparanoia-libs-10.2-r7 coreutils-8.31-r0 @@ -27,7 +27,7 @@ fribidi-1.0.8-r0 git-2.24.3-r0 glib-2.62.6-r0 gmp-6.1.2-r1 -gnutls-3.6.10-r1 +gnutls-3.6.14-r0 graphite2-1.3.13-r1 gst-plugins-base-1.16.2-r0 gstreamer-1.16.2-r0 @@ -115,7 +115,7 @@ ncurses-libs-6.1_p20200118-r4 ncurses-terminfo-base-6.1_p20200118-r4 netcat-openbsd-1.130-r1 nettle-3.5.1-r0 -nghttp2-libs-1.40.0-r0 +nghttp2-libs-1.40.0-r1 nginx-1.16.1-r6 openssl-1.1.1g-r0 opus-1.3.1-r0 From caacf04b1f644d507fda538ea35d8e8efec9351e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 22 Jun 2020 18:57:16 +0000 Subject: [PATCH 009/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b904558..61d0df1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -55,7 +55,7 @@ libgpg-error-1.36-r2 libice-1.0.10-r0 libinput-libs-1.14.3-r0 libintl-0.20.1-r2 -libjpeg-turbo-2.0.4-r0 +libjpeg-turbo-2.0.4-r1 libldap-2.4.48-r2 libmagic-5.37-r1 libmemcached-libs-1.0.18-r4 From a02202f6e7e2ee5702b319c643d1fe2d2b51b302 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Aug 2020 18:52:15 +0000 Subject: [PATCH 010/452] Bot Updating Templated Files --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6ed6b3..f40faca 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -244,7 +244,7 @@ pipeline { cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} @@ -698,6 +698,10 @@ pipeline { ] ]) { sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ @@ -705,7 +709,9 @@ pipeline { -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ - lsiodev/readme-sync bash -c 'node sync' ''' + -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ + lsiodev/readme-sync bash -c 'node sync' + rm -Rf ${TEMPDIR} ''' } } } From fb438d9e1956bdf71e731d2e19f31c4c4e6921fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Aug 2020 14:53:12 -0400 Subject: [PATCH 011/452] Bot Updating Templated Files --- .github/workflows/greetings.yml | 13 +++++++++++++ .github/workflows/stale.yml | 23 +++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100755 .github/workflows/greetings.yml create mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml new file mode 100755 index 0000000..25e44c0 --- /dev/null +++ b/.github/workflows/greetings.yml @@ -0,0 +1,13 @@ +name: Greetings + +on: [pull_request, issues] + +jobs: + greeting: + runs-on: ubuntu-latest + steps: + - uses: actions/first-interaction@v1 + with: + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bookstack/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/.github/PULL_REQUEST_TEMPLATE.md)!' + repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100755 index 0000000..1806420 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,23 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "30 1 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + with: + stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." + stale-issue-label: 'no-issue-activity' + stale-pr-label: 'no-pr-activity' + days-before-stale: 30 + days-before-close: 365 + exempt-issue-labels: 'awaiting-approval,work-in-progress' + exempt-pr-labels: 'awaiting-approval,work-in-progress' + repo-token: ${{ secrets.GITHUB_TOKEN }} From 00e4a68b3766bcef64dd662545fb5613cc4fd2b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 3 Aug 2020 14:59:46 -0400 Subject: [PATCH 012/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 61d0df1..6c77dd8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ libunistring-0.9.10-r0 libuuid-2.34-r1 libvorbis-1.3.6-r2 libwebp-1.0.3-r0 -libx11-1.6.9-r0 +libx11-1.6.10-r0 libxau-1.0.9-r0 libxcb-1.13.1-r0 libxcomposite-0.4.5-r0 From fd86e7485fe31d7d6eddbde5207b0ebc605204cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 17 Aug 2020 14:56:37 -0400 Subject: [PATCH 013/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6c77dd8..92801a8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r3 alpine-keys-2.1-r2 alsa-lib-1.2.1.2-r0 -apache2-utils-2.4.43-r0 +apache2-utils-2.4.46-r0 apk-tools-2.10.5-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 @@ -49,7 +49,7 @@ libevdev-1.8.0-r0 libevent-2.1.11-r0 libffi-3.2.1-r6 libfontenc-1.1.4-r0 -libgcc-9.2.0-r4 +libgcc-9.3.0-r0 libgcrypt-1.8.5-r0 libgpg-error-1.36-r2 libice-1.0.10-r0 @@ -71,7 +71,7 @@ libsasl-2.1.27-r5 libseccomp-2.4.2-r2 libsm-1.2.3-r0 libssl1.1-1.1.1g-r0 -libstdc++-9.2.0-r4 +libstdc++-9.3.0-r0 libtasn1-4.15.0-r0 libtheora-1.1.1-r14 libtls-standalone-2.9.1-r0 From 4c6c4234cdd7c26671b896ae90f59a2861d4de0e Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Tue, 18 Aug 2020 10:08:56 -0400 Subject: [PATCH 014/452] fix substitution of APP_URL when provided https://github.com/linuxserver/docker-bookstack/issues/58 --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index e663f79..b42bf30 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -58,7 +58,7 @@ if [ "${DB_USER}" ]; fi # set appurl if detected -[[ "${APP_URL}" ]] && sed -i "s,#\sAPP_URL.*,APP_URL=${APP_URL},g" /config/www/.env +[ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) From 57cc75f44a8d26fe0d782749efe663a8270479a5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 24 Aug 2020 18:52:29 +0000 Subject: [PATCH 015/452] Bot Updating Templated Files --- .github/workflows/greetings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 25e44c0..5854d78 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -1,6 +1,6 @@ name: Greetings -on: [pull_request, issues] +on: [pull_request_target, issues] jobs: greeting: From 4da3353ba2f7ecd8758e96e605686c29c87f5cd8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 31 Aug 2020 15:07:06 -0400 Subject: [PATCH 016/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 92801a8..16cf5df 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ libunistring-0.9.10-r0 libuuid-2.34-r1 libvorbis-1.3.6-r2 libwebp-1.0.3-r0 -libx11-1.6.10-r0 +libx11-1.6.12-r0 libxau-1.0.9-r0 libxcb-1.13.1-r0 libxcomposite-0.4.5-r0 From 78467ce6e882674874f99f527126d383ecdc3dea Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 7 Sep 2020 14:56:38 -0400 Subject: [PATCH 017/452] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 16cf5df..097ebd4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ fribidi-1.0.8-r0 git-2.24.3-r0 glib-2.62.6-r0 gmp-6.1.2-r1 -gnutls-3.6.14-r0 +gnutls-3.6.15-r0 graphite2-1.3.13-r1 gst-plugins-base-1.16.2-r0 gstreamer-1.16.2-r0 @@ -126,26 +126,26 @@ pcre-8.43-r0 pcre2-10.34-r1 php7-7.3.18-r0 php7-common-7.3.18-r0 -php7-ctype-7.3.18-r0 -php7-curl-7.3.18-r0 -php7-dom-7.3.18-r0 +php7-ctype-7.3.22-r0 +php7-curl-7.3.22-r0 +php7-dom-7.3.22-r0 php7-fileinfo-7.3.18-r0 php7-fpm-7.3.18-r0 -php7-gd-7.3.18-r0 +php7-gd-7.3.22-r0 php7-json-7.3.18-r0 -php7-ldap-7.3.18-r0 +php7-ldap-7.3.22-r0 php7-mbstring-7.3.18-r0 -php7-mysqlnd-7.3.18-r0 +php7-mysqlnd-7.3.22-r0 php7-openssl-7.3.18-r0 -php7-pdo-7.3.18-r0 -php7-pdo_mysql-7.3.18-r0 +php7-pdo-7.3.22-r0 +php7-pdo_mysql-7.3.22-r0 php7-pecl-igbinary-3.0.1-r1 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.18-r0 +php7-phar-7.3.22-r0 php7-session-7.3.18-r0 php7-simplexml-7.3.18-r0 -php7-tidy-7.3.18-r0 -php7-tokenizer-7.3.18-r0 +php7-tidy-7.3.22-r0 +php7-tokenizer-7.3.22-r0 php7-xml-7.3.18-r0 php7-xmlwriter-7.3.18-r0 pixman-0.38.4-r0 From 8e1aeb970bde85e07a5ec9de6c2cde29610275a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Sep 2020 14:57:14 -0400 Subject: [PATCH 018/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 097ebd4..10d3e70 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -124,30 +124,30 @@ p11-kit-0.23.18.1-r0 pango-1.44.7-r0 pcre-8.43-r0 pcre2-10.34-r1 -php7-7.3.18-r0 -php7-common-7.3.18-r0 +php7-7.3.22-r0 +php7-common-7.3.22-r0 php7-ctype-7.3.22-r0 php7-curl-7.3.22-r0 php7-dom-7.3.22-r0 -php7-fileinfo-7.3.18-r0 -php7-fpm-7.3.18-r0 +php7-fileinfo-7.3.22-r0 +php7-fpm-7.3.22-r0 php7-gd-7.3.22-r0 -php7-json-7.3.18-r0 +php7-json-7.3.22-r0 php7-ldap-7.3.22-r0 -php7-mbstring-7.3.18-r0 +php7-mbstring-7.3.22-r0 php7-mysqlnd-7.3.22-r0 -php7-openssl-7.3.18-r0 +php7-openssl-7.3.22-r0 php7-pdo-7.3.22-r0 php7-pdo_mysql-7.3.22-r0 php7-pecl-igbinary-3.0.1-r1 php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.22-r0 -php7-session-7.3.18-r0 -php7-simplexml-7.3.18-r0 +php7-session-7.3.22-r0 +php7-simplexml-7.3.22-r0 php7-tidy-7.3.22-r0 php7-tokenizer-7.3.22-r0 -php7-xml-7.3.18-r0 -php7-xmlwriter-7.3.18-r0 +php7-xml-7.3.22-r0 +php7-xmlwriter-7.3.22-r0 pixman-0.38.4-r0 popt-1.16-r7 procps-3.3.16-r0 From 8af8464d49025f14990a892a4a7ed1432e75ebc0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Sep 2020 16:19:51 -0400 Subject: [PATCH 019/452] rebase to alpine 3.12, bump php uploads --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 4 ++++ 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index aabe386..df2c763 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.11 +FROM lsiobase/nginx:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3ff0607..21bbf56 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.11 +FROM lsiobase/nginx:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6ea2e6c..93655a2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.11 +FROM lsiobase/nginx:arm32v7-3.12 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index ce3daa5..da18bff 100644 --- a/README.md +++ b/README.md @@ -265,6 +265,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default. * **19.12.19:** - Rebasing to alpine 3.11. * **26.07.19:** - Use old version of tidyhtml pending upstream fixes. * **28.06.19:** - Rebasing to alpine 3.10. diff --git a/readme-vars.yml b/readme-vars.yml index 1bac271..362fbf6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -100,6 +100,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index b42bf30..0f3c8cb 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -60,6 +60,10 @@ fi # set appurl if detected [ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env +## Bump php upload max filesize and post max size to 100MB by default +grep -qxF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini +grep -qxF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini + # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do From da9df5c537af958293810b5becccfeded124e3ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Sep 2020 03:39:45 +0000 Subject: [PATCH 020/452] Bot Updating Package Versions --- package_versions.txt | 198 ++++++++++++++++++++++--------------------- 1 file changed, 101 insertions(+), 97 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 10d3e70..6f368dc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,96 +1,97 @@ -alpine-baselayout-3.2.0-r3 -alpine-keys-2.1-r2 -alsa-lib-1.2.1.2-r0 +alpine-baselayout-3.2.0-r7 +alpine-keys-2.2-r0 +alsa-lib-1.2.2-r0 apache2-utils-2.4.46-r0 -apk-tools-2.10.5-r0 +apk-tools-2.10.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 -avahi-libs-0.7-r4 -bash-5.0.11-r1 -busybox-1.31.1-r9 -ca-certificates-20191127-r2 -ca-certificates-cacert-20191127-r2 +avahi-libs-0.8-r0 +bash-5.0.17-r0 +brotli-libs-1.0.7-r5 +busybox-1.31.1-r19 +ca-certificates-20191127-r4 +ca-certificates-bundle-20191127-r4 cairo-1.16.0-r2 -cdparanoia-libs-10.2-r7 -coreutils-8.31-r0 -cups-libs-2.2.12-r1 -curl-7.67.0-r0 +cdparanoia-libs-10.2-r8 +coreutils-8.32-r0 +cups-libs-2.3.3-r0 +curl-7.69.1-r1 db-5.3.28-r1 -dbus-libs-1.12.16-r3 +dbus-libs-1.12.18-r0 encodings-1.0.5-r0 -eudev-libs-3.2.9-r1 +eudev-libs-3.2.9-r3 expat-2.2.9-r1 fontconfig-2.13.1-r2 -freetype-2.10.1-r0 -fribidi-1.0.8-r0 -git-2.24.3-r0 -glib-2.62.6-r0 -gmp-6.1.2-r1 +freetype-2.10.2-r0 +fribidi-1.0.9-r0 +git-2.26.2-r0 +glib-2.64.5-r0 +gmp-6.2.0-r0 gnutls-3.6.15-r0 -graphite2-1.3.13-r1 -gst-plugins-base-1.16.2-r0 -gstreamer-1.16.2-r0 -harfbuzz-2.6.4-r0 +graphite2-1.3.14-r0 +gst-plugins-base-1.16.2-r3 +gstreamer-1.16.2-r2 +harfbuzz-2.6.6-r0 hicolor-icon-theme-0.17-r1 -icu-libs-64.2-r1 +hyphen-2.8.8-r1 +icu-libs-67.1-r0 libacl-2.2.53-r0 libattr-2.4.48-r0 -libblkid-2.34-r1 +libblkid-2.35.2-r0 libbsd-0.10.0-r0 libbz2-1.0.8-r1 -libc-utils-0.7.2-r0 +libc-utils-0.7.2-r3 libcap-2.27-r0 libcrypto1.1-1.1.1g-r0 -libcurl-7.67.0-r0 -libdrm-2.4.100-r0 -libedit-20191211.3.1-r0 -libevdev-1.8.0-r0 -libevent-2.1.11-r0 -libffi-3.2.1-r6 +libcurl-7.69.1-r0 +libdrm-2.4.102-r0 +libedit-20191231.3.1-r0 +libevdev-1.9.0-r0 +libevent-2.1.11-r1 +libffi-3.3-r2 libfontenc-1.1.4-r0 -libgcc-9.3.0-r0 +libgcc-9.3.0-r2 libgcrypt-1.8.5-r0 -libgpg-error-1.36-r2 +libgpg-error-1.37-r0 libice-1.0.10-r0 -libinput-libs-1.14.3-r0 -libintl-0.20.1-r2 -libjpeg-turbo-2.0.4-r1 -libldap-2.4.48-r2 -libmagic-5.37-r1 +libinput-libs-1.15.5-r1 +libintl-0.20.2-r0 +libjpeg-turbo-2.0.5-r0 +libldap-2.4.50-r0 +libmagic-5.38-r0 libmemcached-libs-1.0.18-r4 -libmount-2.34-r1 +libmount-2.35.2-r0 libogg-1.3.4-r0 libpciaccess-0.16-r0 -libpcre2-16-10.34-r1 +libpcre2-16-10.35-r0 libpng-1.6.37-r1 libproc-3.3.16-r0 -libressl3.0-libcrypto-3.0.2-r0 -libressl3.0-libssl-3.0.2-r0 -libsasl-2.1.27-r5 -libseccomp-2.4.2-r2 +libressl3.1-libcrypto-3.1.2-r0 +libressl3.1-libssl-3.1.2-r0 +libsasl-2.1.27-r6 +libseccomp-2.4.3-r0 libsm-1.2.3-r0 libssl1.1-1.1.1g-r0 -libstdc++-9.3.0-r0 -libtasn1-4.15.0-r0 +libstdc++-9.3.0-r2 +libtasn1-4.16.0-r1 libtheora-1.1.1-r14 -libtls-standalone-2.9.1-r0 +libtls-standalone-2.9.1-r1 libunistring-0.9.10-r0 -libuuid-2.34-r1 +libuuid-2.35.2-r0 libvorbis-1.3.6-r2 -libwebp-1.0.3-r0 +libwebp-1.1.0-r0 libx11-1.6.12-r0 libxau-1.0.9-r0 -libxcb-1.13.1-r0 -libxcomposite-0.4.5-r0 +libxcb-1.14-r1 libxdamage-1.1.5-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxfixes-5.0.3-r2 libxft-2.3.3-r0 -libxkbcommon-0.9.1-r0 -libxkbcommon-x11-0.9.1-r0 -libxml2-2.9.10-r3 +libxkbcommon-0.10.0-r1 +libxkbcommon-x11-0.10.0-r1 +libxml2-2.9.10-r4 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r0 @@ -98,32 +99,32 @@ libxslt-1.1.34-r0 libxt-1.2.0-r0 libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 -linux-pam-1.3.1-r1 -logrotate-3.15.1-r0 -memcached-1.5.20-r0 -mesa-19.2.7-r0 -mesa-egl-19.2.7-r0 -mesa-gbm-19.2.7-r0 -mesa-gl-19.2.7-r0 -mesa-glapi-19.2.7-r0 +linux-pam-1.3.1-r4 +logrotate-3.16.0-r0 +memcached-1.6.6-r0 +mesa-20.0.7-r0 +mesa-egl-20.0.7-r0 +mesa-gbm-20.0.7-r0 +mesa-gl-20.0.7-r0 +mesa-glapi-20.0.7-r0 mkfontscale-1.2.1-r1 -mtdev-1.1.5-r2 -musl-1.1.24-r2 -musl-utils-1.1.24-r2 -nano-4.6-r0 -ncurses-libs-6.1_p20200118-r4 -ncurses-terminfo-base-6.1_p20200118-r4 +mtdev-1.1.6-r0 +musl-1.1.24-r9 +musl-utils-1.1.24-r9 +nano-4.9.3-r0 +ncurses-libs-6.2_p20200523-r0 +ncurses-terminfo-base-6.2_p20200523-r0 netcat-openbsd-1.130-r1 -nettle-3.5.1-r0 -nghttp2-libs-1.40.0-r1 -nginx-1.16.1-r6 +nettle-3.5.1-r1 +nghttp2-libs-1.41.0-r0 +nginx-1.18.0-r0 openssl-1.1.1g-r0 opus-1.3.1-r0 -orc-0.4.31-r0 -p11-kit-0.23.18.1-r0 -pango-1.44.7-r0 -pcre-8.43-r0 -pcre2-10.34-r1 +orc-0.4.31-r2 +p11-kit-0.23.20-r5 +pango-1.44.7-r2 +pcre-8.44-r0 +pcre2-10.35-r0 php7-7.3.22-r0 php7-common-7.3.22-r0 php7-ctype-7.3.22-r0 @@ -139,7 +140,7 @@ php7-mysqlnd-7.3.22-r0 php7-openssl-7.3.22-r0 php7-pdo-7.3.22-r0 php7-pdo_mysql-7.3.22-r0 -php7-pecl-igbinary-3.0.1-r1 +php7-pecl-igbinary-3.1.4-r0 php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.22-r0 php7-session-7.3.22-r0 @@ -148,32 +149,35 @@ php7-tidy-7.3.22-r0 php7-tokenizer-7.3.22-r0 php7-xml-7.3.22-r0 php7-xmlwriter-7.3.22-r0 -pixman-0.38.4-r0 +pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 -qt5-qtbase-5.12.5-r0 -qt5-qtbase-x11-5.12.5-r0 -qt5-qtdeclarative-5.12.5-r0 -qt5-qtsvg-5.12.5-r0 -qt5-qtwebkit-5.9.1-r7 -readline-8.0.1-r0 -scanelf-1.2.4-r0 -shadow-4.7-r1 -sqlite-libs-3.30.1-r2 -ssl_client-1.31.1-r9 +qt5-qtbase-5.14.2-r1 +qt5-qtbase-x11-5.14.2-r1 +qt5-qtdeclarative-5.14.2-r0 +qt5-qtlocation-5.14.2-r0 +qt5-qtsensors-5.14.2-r0 +qt5-qtsvg-5.14.2-r0 +qt5-qtwebchannel-5.14.2-r0 +qt5-qtwebkit-5.212.0_alpha4-r11 +readline-8.0.4-r0 +scanelf-1.2.6-r0 +shadow-4.8.1-r0 +sqlite-libs-3.32.1-r0 +ssl_client-1.31.1-r19 tar-1.32-r1 tidyhtml-libs-5.6.0-r0 ttf-freefont-20120503-r1 tzdata-2020a-r0 -wayland-libs-client-1.17.0-r0 -wayland-libs-egl-1.17.0-r0 -wayland-libs-server-1.17.0-r0 -wkhtmltopdf-0.12.5-r0 -xcb-util-0.4.0-r1 +wayland-libs-client-1.18.0-r4 +wayland-libs-egl-1.18.0-r4 +wayland-libs-server-1.18.0-r4 +wkhtmltopdf-0.12.5-r1 +xcb-util-0.4.0-r3 xcb-util-image-0.4.0-r1 xcb-util-keysyms-0.4.0-r1 xcb-util-renderutil-0.3.9-r1 xcb-util-wm-0.4.1-r1 -xz-5.2.4-r0 -xz-libs-5.2.4-r0 +xz-5.2.5-r0 +xz-libs-5.2.5-r0 zlib-1.2.11-r3 From a1f703cae8b7bd7dc1771e27163b9dd65221748d Mon Sep 17 00:00:00 2001 From: Philip Almueti Date: Sat, 19 Sep 2020 14:33:45 -0700 Subject: [PATCH 021/452] Resolving php-local.ini mangling --- root/etc/cont-init.d/50-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0f3c8cb..12a0a47 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -61,8 +61,8 @@ fi [ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env ## Bump php upload max filesize and post max size to 100MB by default -grep -qxF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini -grep -qxF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini +grep -qx 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini +grep -qx 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) From 047e84e2d2011bf19600272ffc3ae7e6af5b2b0c Mon Sep 17 00:00:00 2001 From: Philip Almueti Date: Sat, 19 Sep 2020 14:39:56 -0700 Subject: [PATCH 022/452] Adding appropriate regex from original command --- root/etc/cont-init.d/50-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 12a0a47..39b6626 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -61,8 +61,8 @@ fi [ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env ## Bump php upload max filesize and post max size to 100MB by default -grep -qx 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini -grep -qx 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini +grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini +grep -qx '^post_max_size.*$' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) From 608466e6e07ae15bc87ccb96efd20e1df1aaf2b7 Mon Sep 17 00:00:00 2001 From: Philip Almueti Date: Sat, 19 Sep 2020 15:10:26 -0700 Subject: [PATCH 023/452] Patching previously added erronous lines by replacing them with empty lines instead. --- root/etc/cont-init.d/50-config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 39b6626..d512eef 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -64,6 +64,12 @@ fi grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini grep -qx '^post_max_size.*$' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini + +## TODO: Remove this following bit by 12/19/2020 +# Remove erronously added configs post-init +sed -i "s/^upload_max_filesize = 100MB$//g" /config/php/php-local.ini +sed -i "s/^post_max_size = 100MB$//g" /config/php/php-local.ini + # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do From b2f069f66265679e905a1327a848c4fc2032fc2f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Sep 2020 11:40:37 +0100 Subject: [PATCH 024/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6f368dc..df7be4b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,7 +44,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r0 +libcurl-7.69.1-r1 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 libevdev-1.9.0-r0 @@ -91,7 +91,7 @@ libxfixes-5.0.3-r2 libxft-2.3.3-r0 libxkbcommon-0.10.0-r1 libxkbcommon-x11-0.10.0-r1 -libxml2-2.9.10-r4 +libxml2-2.9.10-r5 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r0 From b951132502c77474a076a8ddd9f96f2d91472f4b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Oct 2020 18:52:34 +0000 Subject: [PATCH 025/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 12 ++++-- .github/PULL_REQUEST_TEMPLATE.md | 10 +++-- .github/workflows/greetings.yml | 4 +- Jenkinsfile | 28 ++++++++++++- README.md | 72 +++++++++++++++++--------------- 5 files changed, 81 insertions(+), 45 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index efe81f2..7fb7100 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,10 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] -If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. + + + + @@ -22,9 +25,10 @@ If you are new to Docker or this application our issue tracker is **ONLY** used 4. ## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + ## Command used to create docker container (run/create/compose/screenshot) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 26d5031..ca9b100 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,11 +2,11 @@ [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - + - + @@ -21,7 +21,11 @@ ------------------------------ -We welcome all PR’s though this doesn’t guarantee it will be accepted. + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-bookstack/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + +------------------------------ + + ## Description: diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 5854d78..62ece8c 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bookstack/.github/ISSUE_TEMPLATE.md)!' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index f40faca..e7385a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -146,6 +146,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } } } @@ -166,6 +167,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' } } @@ -186,6 +188,7 @@ pipeline { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' } @@ -553,8 +556,10 @@ pipeline { for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} + docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} done ''' } @@ -562,6 +567,7 @@ pipeline { for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ + ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:latest || : done ''' @@ -602,12 +608,18 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-latest docker push ${MANIFESTIMAGE}:arm32v7-latest docker push ${MANIFESTIMAGE}:arm64v8-latest + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -616,8 +628,12 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} @@ -626,6 +642,10 @@ pipeline { docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker push ${GITHUBIMAGE}:amd64-${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} @@ -633,6 +653,10 @@ pipeline { docker push ${GITHUBIMAGE}:${META_TAG} docker push ${GITHUBIMAGE}:arm32v7-latest docker push ${GITHUBIMAGE}:arm64v8-latest + docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -701,7 +725,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull lsiodev/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ diff --git a/README.md b/README.md index da18bff..3c349b3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + + + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![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!") @@ -63,30 +66,11 @@ The architectures supported by this image are: Here are some example snippets to help you get started creating a container. -### docker - -``` -docker create \ - --name=bookstack \ - -e PUID=1000 \ - -e PGID=1000 \ - -e DB_HOST= \ - -e DB_USER= \ - -e DB_PASS= \ - -e DB_DATABASE=bookstackapp \ - -e APP_URL=http://your.site.here.xyz `#optional` \ - -p 6875:80 \ - -v /path/to/data:/config \ - --restart unless-stopped \ - linuxserver/bookstack -``` - - -### docker-compose +### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) Compatible with docker-compose v2 schemas. -``` +```yaml --- version: "2" services: @@ -124,6 +108,25 @@ services: ``` +### docker cli + +``` +docker run -d \ + --name=bookstack \ + -e PUID=1000 \ + -e PGID=1000 \ + -e DB_HOST= \ + -e DB_USER= \ + -e DB_PASS= \ + -e DB_DATABASE=bookstackapp \ + -e APP_URL=http://your.site.here.xyz `#optional` \ + -p 6875:80 \ + -v /path/to/data:/config \ + --restart unless-stopped \ + linuxserver/bookstack +``` + + ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -196,9 +199,9 @@ The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/ ## Docker Mods -[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") +[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=bookstack&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") -We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above. +We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. ## Support Info @@ -216,14 +219,6 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: -### Via Docker Run/Create -* Update the image: `docker pull linuxserver/bookstack` -* Stop the running container: `docker stop bookstack` -* Delete the container: `docker rm bookstack` -* Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* Start the new container: `docker start bookstack` -* You can also remove the old dangling images: `docker image prune` - ### Via Docker Compose * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull bookstack` @@ -231,7 +226,14 @@ Below are the instructions for updating containers: * or update a single container: `docker-compose up -d bookstack` * You can also remove the old dangling images: `docker image prune` -### Via Watchtower auto-updater (especially useful if you don't remember the original parameters) +### Via Docker Run +* Update the image: `docker pull linuxserver/bookstack` +* Stop the running container: `docker stop bookstack` +* Delete the container: `docker rm bookstack` +* Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) +* You can also remove the old dangling images: `docker image prune` + +### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: ``` docker run --rm \ @@ -239,10 +241,12 @@ Below are the instructions for updating containers: containrrr/watchtower \ --run-once bookstack ``` +* You can also remove the old dangling images: `docker image prune` -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. +**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). -* You can also remove the old dangling images: `docker image prune` +### Image Update Notifications - Diun (Docker Image Update Notifier) +* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From af9ff735517b91f206e24202051d945327517e51 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Oct 2020 14:53:38 -0400 Subject: [PATCH 026/452] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 122 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100755 .github/CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100755 index 0000000..658522b --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,122 @@ +# Contributing to bookstack + +## Gotchas + +* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. +* Read, and fill the Pull Request template + * If this is a fix for a typo in code or documentation in the README please file an issue + * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) + +## Common files + +| File | Use case | +| :----: | --- | +| `Dockerfile` | Dockerfile used to build amd64 images | +| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures | +| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures | +| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image | +| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process | +| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions | +| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries | +| `readme-vars.yml` | This file is used to generate the `README.md` | + +## Readme + +If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-bookstack/edit/master/readme-vars.yml). + +These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. +Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-bookstack) + +### Fixing typos or clarify the text in the readme + +There are variables for multiple parts of the readme, the most common ones are: + +| Variable | Description | +| :----: | --- | +| `project_blurb` | This is the short excerpt shown above the project logo. | +| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled | + +### Parameters + +The compose and run examples are also generated from these variables. + +We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder. + +These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`. +Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file. + +Devices, environment variables, ports and volumes expects its variables in a certain way. + +### Devices + +```yml +param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +opt_param_devices: + - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" } +``` + +### Environment variables + +```yml +param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } +opt_param_env_vars: + - { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." } +``` + +### Ports + +```yml +param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +opt_param_ports: + - { external_port: "80", internal_port: "80", port_desc: "Application WebUI" } +``` + +### Volumes + +```yml +param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +opt_param_volumes: + - { vol_path: "/config", vol_host_path: "", desc: "Configuration files." } +``` + +### Testing template changes + +After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR. + +## Dockerfiles + +We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work. +If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order. + +### Testing your changes + +``` +git clone https://github.com/linuxserver/docker-bookstack.git +cd docker-bookstack +docker build \ + --no-cache \ + --pull \ + -t linuxserver/bookstack:latest . +``` + +The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +``` +docker run --rm --privileged multiarch/qemu-user-static:register --reset +``` + +Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. + +## Update the chagelog + +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bookstack/tree/master/root), add an entry to the changelog + +```yml +changelogs: + - { date: "DD.MM.YY:", desc: "Added some love to templates" } +``` From d5defa6e1325738d79469d4af9bd72846291d1f2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 5 Oct 2020 14:59:56 -0400 Subject: [PATCH 027/452] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index df7be4b..4b217b6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ fontconfig-2.13.1-r2 freetype-2.10.2-r0 fribidi-1.0.9-r0 git-2.26.2-r0 -glib-2.64.5-r0 +glib-2.64.6-r0 gmp-6.2.0-r0 gnutls-3.6.15-r0 graphite2-1.3.14-r0 @@ -125,30 +125,30 @@ p11-kit-0.23.20-r5 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.22-r0 -php7-common-7.3.22-r0 -php7-ctype-7.3.22-r0 -php7-curl-7.3.22-r0 -php7-dom-7.3.22-r0 -php7-fileinfo-7.3.22-r0 -php7-fpm-7.3.22-r0 -php7-gd-7.3.22-r0 -php7-json-7.3.22-r0 -php7-ldap-7.3.22-r0 -php7-mbstring-7.3.22-r0 -php7-mysqlnd-7.3.22-r0 -php7-openssl-7.3.22-r0 -php7-pdo-7.3.22-r0 -php7-pdo_mysql-7.3.22-r0 +php7-7.3.23-r0 +php7-common-7.3.23-r0 +php7-ctype-7.3.23-r0 +php7-curl-7.3.23-r0 +php7-dom-7.3.23-r0 +php7-fileinfo-7.3.23-r0 +php7-fpm-7.3.23-r0 +php7-gd-7.3.23-r0 +php7-json-7.3.23-r0 +php7-ldap-7.3.23-r0 +php7-mbstring-7.3.23-r0 +php7-mysqlnd-7.3.23-r0 +php7-openssl-7.3.23-r0 +php7-pdo-7.3.23-r0 +php7-pdo_mysql-7.3.23-r0 php7-pecl-igbinary-3.1.4-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.22-r0 -php7-session-7.3.22-r0 -php7-simplexml-7.3.22-r0 -php7-tidy-7.3.22-r0 -php7-tokenizer-7.3.22-r0 -php7-xml-7.3.22-r0 -php7-xmlwriter-7.3.22-r0 +php7-phar-7.3.23-r0 +php7-session-7.3.23-r0 +php7-simplexml-7.3.23-r0 +php7-tidy-7.3.23-r0 +php7-tokenizer-7.3.23-r0 +php7-xml-7.3.23-r0 +php7-xmlwriter-7.3.23-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 From ca7a63fdd56bb41084108c9a4542c40583bea03b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 12 Oct 2020 18:56:37 +0000 Subject: [PATCH 028/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4b217b6..6bcf197 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,7 +8,7 @@ apr-util-1.6.1-r6 argon2-libs-20190702-r1 avahi-libs-0.8-r0 bash-5.0.17-r0 -brotli-libs-1.0.7-r5 +brotli-libs-1.0.9-r1 busybox-1.31.1-r19 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 @@ -140,7 +140,7 @@ php7-mysqlnd-7.3.23-r0 php7-openssl-7.3.23-r0 php7-pdo-7.3.23-r0 php7-pdo_mysql-7.3.23-r0 -php7-pecl-igbinary-3.1.4-r0 +php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.23-r0 php7-session-7.3.23-r0 From 8edc88059f43fd8ed4322046e3ccf96a08570f41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 19 Oct 2020 18:58:41 +0000 Subject: [PATCH 029/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6bcf197..28d8534 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -94,7 +94,7 @@ libxkbcommon-x11-0.10.0-r1 libxml2-2.9.10-r5 libxpm-3.5.13-r0 libxrender-0.9.10-r3 -libxshmfence-1.3-r0 +libxshmfence-1.3-r1 libxslt-1.1.34-r0 libxt-1.2.0-r0 libxv-1.0.11-r2 From ec3e870528c6aab2753aefc969ddb31fe975c54e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 26 Oct 2020 15:56:02 -0400 Subject: [PATCH 030/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 28d8534..e958b7b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ encodings-1.0.5-r0 eudev-libs-3.2.9-r3 expat-2.2.9-r1 fontconfig-2.13.1-r2 -freetype-2.10.2-r0 +freetype-2.10.4-r0 fribidi-1.0.9-r0 git-2.26.2-r0 glib-2.64.6-r0 @@ -117,7 +117,7 @@ ncurses-terminfo-base-6.2_p20200523-r0 netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r0 +nginx-1.18.0-r1 openssl-1.1.1g-r0 opus-1.3.1-r0 orc-0.4.31-r2 From 381ed0984ada1d0c9b65fe8aad6b44007bb24890 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 1 Nov 2020 19:54:15 -0800 Subject: [PATCH 031/452] update baseimages --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index df2c763..f4c9a1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 21bbf56..ca6a862 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 93655a2..6e2d6bb 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 # set version label ARG BUILD_DATE From 443c9f1ddebadcc4eccf70d9c8cc360fc3926350 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 03:55:40 +0000 Subject: [PATCH 032/452] Bot Updating Templated Files --- Jenkinsfile | 162 ++++++++++++++++++++-------------------------------- README.md | 12 ++-- 2 files changed, 67 insertions(+), 107 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e7385a0..e55771d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -138,7 +138,7 @@ pipeline { steps { script{ env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER @@ -159,7 +159,7 @@ pipeline { steps { script{ env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA @@ -180,7 +180,7 @@ pipeline { steps { script{ env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST @@ -201,24 +201,24 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') ]) { script{ - env.SHELLCHECK_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' + env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash set -e - docker pull lsiodev/spaces-file-upload:latest + docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ -e FILE_NAME="shellcheck-result.xml" \ -e MIMETYPE="text/xml" \ -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ - -t lsiodev/spaces-file-upload:latest \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ + -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ python /upload.py''' } } @@ -236,8 +236,8 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -342,28 +342,19 @@ pipeline { label 'ARMHF' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm32v7-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } stage('Build ARM64') { @@ -371,28 +362,19 @@ pipeline { label 'ARM64' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - echo 'Logging into DockerHub' - sh '''#! /bin/bash - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + echo 'Logging into Github' + sh '''#! /bin/bash + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + ''' + sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + retry(5) { + sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } + sh '''docker rmi \ + ${IMAGE}:arm64v8-${META_TAG} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } } } @@ -491,20 +473,20 @@ pipeline { } steps { withCredentials([ - string(credentialsId: 'spaces-key', variable: 'DO_KEY'), - string(credentialsId: 'spaces-secret', variable: 'DO_SECRET') + string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), + string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') ]) { script{ - env.CI_URL = 'https://lsio-ci.ams3.digitaloceanspaces.com/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' } sh '''#! /bin/bash set -e - docker pull lsiodev/ci:latest + docker pull ghcr.io/linuxserver/lsiodev-ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ --shm-size=1gb \ @@ -516,15 +498,15 @@ pipeline { -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${DO_SECRET}\" \ - -e ACCESS_KEY=\"${DO_KEY}\" \ + -e SECRET_KEY=\"${S3_SECRET}\" \ + -e ACCESS_KEY=\"${S3_KEY}\" \ -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t lsiodev/ci:latest \ + -t ghcr.io/linuxserver/lsiodev-ci:latest \ python /ci/ci.py''' } } @@ -551,7 +533,7 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} @@ -593,15 +575,15 @@ pipeline { sh '''#! /bin/bash set -e echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin - echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin if [ "${CI}" == "false" ]; then - docker pull lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} - docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -635,28 +617,6 @@ pipeline { docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} done - docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${META_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${META_TAG} - docker push ${GITHUBIMAGE}:latest - docker push ${GITHUBIMAGE}:${META_TAG} - docker push ${GITHUBIMAGE}:arm32v7-latest - docker push ${GITHUBIMAGE}:arm64v8-latest - docker push ${GITHUBIMAGE}:${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm32v7-${EXT_RELEASE_TAG} - docker push ${GITHUBIMAGE}:arm64v8-${EXT_RELEASE_TAG} ''' } sh '''#! /bin/bash @@ -670,8 +630,8 @@ pipeline { ${DELETEIMAGE}:arm64v8-latest || : done docker rmi \ - lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : + ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ + ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : ''' } } @@ -724,9 +684,9 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest - docker pull lsiodev/readme-sync + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker pull ghcr.io/linuxserver/lsiodev-readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -734,7 +694,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - lsiodev/readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index 3c349b3..ae6cc0f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Flsio-ci.ams3.digitaloceanspaces.com%2Flinuxserver%2Fbookstack%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/bookstack/latest/index.html) +[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbookstack%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bookstack/latest/index.html) [Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. @@ -51,7 +51,7 @@ For more information on BookStack visit their website and check it out: https:// Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `ghcr.io/linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -123,7 +123,7 @@ docker run -d \ -p 6875:80 \ -v /path/to/data:/config \ --restart unless-stopped \ - linuxserver/bookstack + ghcr.io/linuxserver/bookstack ``` @@ -211,7 +211,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/bookstack` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/bookstack` ## Updating Info @@ -227,7 +227,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run -* Update the image: `docker pull linuxserver/bookstack` +* Update the image: `docker pull ghcr.io/linuxserver/bookstack` * Stop the running container: `docker stop bookstack` * Delete the container: `docker rm bookstack` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -257,7 +257,7 @@ cd docker-bookstack docker build \ --no-cache \ --pull \ - -t linuxserver/bookstack:latest . + -t ghcr.io/linuxserver/bookstack:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 2fbd598d81c08cf172a7e2d5988caffba6a943ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 2 Nov 2020 04:00:12 +0000 Subject: [PATCH 033/452] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e958b7b..2ab1cf0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -125,30 +125,30 @@ p11-kit-0.23.20-r5 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.23-r0 -php7-common-7.3.23-r0 -php7-ctype-7.3.23-r0 -php7-curl-7.3.23-r0 -php7-dom-7.3.23-r0 -php7-fileinfo-7.3.23-r0 -php7-fpm-7.3.23-r0 -php7-gd-7.3.23-r0 -php7-json-7.3.23-r0 -php7-ldap-7.3.23-r0 -php7-mbstring-7.3.23-r0 -php7-mysqlnd-7.3.23-r0 -php7-openssl-7.3.23-r0 -php7-pdo-7.3.23-r0 -php7-pdo_mysql-7.3.23-r0 +php7-7.3.24-r0 +php7-common-7.3.24-r0 +php7-ctype-7.3.24-r0 +php7-curl-7.3.24-r0 +php7-dom-7.3.24-r0 +php7-fileinfo-7.3.24-r0 +php7-fpm-7.3.24-r0 +php7-gd-7.3.24-r0 +php7-json-7.3.24-r0 +php7-ldap-7.3.24-r0 +php7-mbstring-7.3.24-r0 +php7-mysqlnd-7.3.24-r0 +php7-openssl-7.3.24-r0 +php7-pdo-7.3.24-r0 +php7-pdo_mysql-7.3.24-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.23-r0 -php7-session-7.3.23-r0 -php7-simplexml-7.3.23-r0 -php7-tidy-7.3.23-r0 -php7-tokenizer-7.3.23-r0 -php7-xml-7.3.23-r0 -php7-xmlwriter-7.3.23-r0 +php7-phar-7.3.24-r0 +php7-session-7.3.24-r0 +php7-simplexml-7.3.24-r0 +php7-tidy-7.3.24-r0 +php7-tokenizer-7.3.24-r0 +php7-xml-7.3.24-r0 +php7-xmlwriter-7.3.24-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 @@ -168,7 +168,7 @@ ssl_client-1.31.1-r19 tar-1.32-r1 tidyhtml-libs-5.6.0-r0 ttf-freefont-20120503-r1 -tzdata-2020a-r0 +tzdata-2020c-r0 wayland-libs-client-1.18.0-r4 wayland-libs-egl-1.18.0-r4 wayland-libs-server-1.18.0-r4 From a99d499663ae191a970abd50de332e10b31504fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 30 Nov 2020 15:04:57 -0500 Subject: [PATCH 034/452] Bot Updating Package Versions --- package_versions.txt | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2ab1cf0..ec04f0c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -109,8 +109,8 @@ mesa-gl-20.0.7-r0 mesa-glapi-20.0.7-r0 mkfontscale-1.2.1-r1 mtdev-1.1.6-r0 -musl-1.1.24-r9 -musl-utils-1.1.24-r9 +musl-1.1.24-r10 +musl-utils-1.1.24-r10 nano-4.9.3-r0 ncurses-libs-6.2_p20200523-r0 ncurses-terminfo-base-6.2_p20200523-r0 @@ -125,30 +125,30 @@ p11-kit-0.23.20-r5 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.24-r0 -php7-common-7.3.24-r0 -php7-ctype-7.3.24-r0 -php7-curl-7.3.24-r0 -php7-dom-7.3.24-r0 -php7-fileinfo-7.3.24-r0 -php7-fpm-7.3.24-r0 -php7-gd-7.3.24-r0 -php7-json-7.3.24-r0 -php7-ldap-7.3.24-r0 -php7-mbstring-7.3.24-r0 -php7-mysqlnd-7.3.24-r0 -php7-openssl-7.3.24-r0 -php7-pdo-7.3.24-r0 -php7-pdo_mysql-7.3.24-r0 +php7-7.3.25-r0 +php7-common-7.3.25-r0 +php7-ctype-7.3.25-r0 +php7-curl-7.3.25-r0 +php7-dom-7.3.25-r0 +php7-fileinfo-7.3.25-r0 +php7-fpm-7.3.25-r0 +php7-gd-7.3.25-r0 +php7-json-7.3.25-r0 +php7-ldap-7.3.25-r0 +php7-mbstring-7.3.25-r0 +php7-mysqlnd-7.3.25-r0 +php7-openssl-7.3.25-r0 +php7-pdo-7.3.25-r0 +php7-pdo_mysql-7.3.25-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.24-r0 -php7-session-7.3.24-r0 -php7-simplexml-7.3.24-r0 -php7-tidy-7.3.24-r0 -php7-tokenizer-7.3.24-r0 -php7-xml-7.3.24-r0 -php7-xmlwriter-7.3.24-r0 +php7-phar-7.3.25-r0 +php7-session-7.3.25-r0 +php7-simplexml-7.3.25-r0 +php7-tidy-7.3.25-r0 +php7-tokenizer-7.3.25-r0 +php7-xml-7.3.25-r0 +php7-xmlwriter-7.3.25-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 @@ -168,7 +168,7 @@ ssl_client-1.31.1-r19 tar-1.32-r1 tidyhtml-libs-5.6.0-r0 ttf-freefont-20120503-r1 -tzdata-2020c-r0 +tzdata-2020c-r1 wayland-libs-client-1.18.0-r4 wayland-libs-egl-1.18.0-r4 wayland-libs-server-1.18.0-r4 From 64d609bba5a1a7c658f5c21020475fb5b77cea41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Dec 2020 21:41:09 +0000 Subject: [PATCH 035/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ec04f0c..5caaa34 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 alsa-lib-1.2.2-r0 -apache2-utils-2.4.46-r0 +apache2-utils-2.4.46-r1 apk-tools-2.10.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r6 From 03007efc8b11342b1b75fc6df9c567e3b4dd3e32 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Dec 2020 19:58:27 +0000 Subject: [PATCH 036/452] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5caaa34..f94b503 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ cairo-1.16.0-r2 cdparanoia-libs-10.2-r8 coreutils-8.32-r0 cups-libs-2.3.3-r0 -curl-7.69.1-r1 +curl-7.69.1-r3 db-5.3.28-r1 dbus-libs-1.12.18-r0 encodings-1.0.5-r0 @@ -44,7 +44,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 libcrypto1.1-1.1.1g-r0 -libcurl-7.69.1-r1 +libcurl-7.69.1-r3 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 libevdev-1.9.0-r0 @@ -58,7 +58,7 @@ libice-1.0.10-r0 libinput-libs-1.15.5-r1 libintl-0.20.2-r0 libjpeg-turbo-2.0.5-r0 -libldap-2.4.50-r0 +libldap-2.4.50-r1 libmagic-5.38-r0 libmemcached-libs-1.0.18-r4 libmount-2.35.2-r0 @@ -118,10 +118,10 @@ netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1g-r0 +openssl-1.1.1i-r0 opus-1.3.1-r0 orc-0.4.31-r2 -p11-kit-0.23.20-r5 +p11-kit-0.23.22-r0 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 From 92e376e015700b793ba20766d391e6e28db0e948 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 14:35:26 -0500 Subject: [PATCH 037/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 37 ------------------------------------- Jenkinsfile | 30 ++++++++++++++++++++++-------- README.md | 2 +- 3 files changed, 23 insertions(+), 46 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7fb7100..8b13789 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,38 +1 @@ -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/Jenkinsfile b/Jenkinsfile index e55771d..bb06cb2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -145,6 +145,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN } @@ -166,6 +167,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' @@ -187,6 +189,7 @@ pipeline { } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST @@ -248,9 +251,12 @@ pipeline { git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} + git rm .github/ISSUE_TEMPLATE.md git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -320,8 +326,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -333,8 +340,9 @@ pipeline { parallel { stage('Build X86') { steps { + echo "Running on node: ${NODE_NAME}" sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -342,12 +350,13 @@ pipeline { label 'ARMHF' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -362,12 +371,13 @@ pipeline { label 'ARM64' } steps { + echo "Running on node: ${NODE_NAME}" echo 'Logging into Github' sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -610,6 +620,7 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 @@ -624,10 +635,13 @@ pipeline { docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-latest \ + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ @@ -694,7 +708,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } diff --git a/README.md b/README.md index ae6cc0f..4640dd8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Find us at: [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/Linuxserver.io/docker-bookstack/container_registry) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bookstack/container_registry) [![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) From 87b8155ac6ac73d0d0efc68e6b86850eb9a25b94 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Dec 2020 19:41:20 +0000 Subject: [PATCH 038/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE.md | 1 - .github/ISSUE_TEMPLATE/config.yml | 13 +++ .github/ISSUE_TEMPLATE/issue.bug.md | 40 +++++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 25 ++++++ .github/workflows/external_trigger.yml | 90 +++++++++++++++++++ .../workflows/external_trigger_scheduler.yml | 43 +++++++++ .github/workflows/package_trigger.yml | 38 ++++++++ .../workflows/package_trigger_scheduler.yml | 50 +++++++++++ 8 files changed, 299 insertions(+), 1 deletion(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100755 .github/ISSUE_TEMPLATE/config.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md create mode 100755 .github/workflows/external_trigger.yml create mode 100755 .github/workflows/external_trigger_scheduler.yml create mode 100755 .github/workflows/package_trigger.yml create mode 100755 .github/workflows/package_trigger_scheduler.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 8b13789..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100755 index 0000000..d923aba --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,13 @@ +blank_issues_enabled: false +contact_links: + - name: Discord chat support + url: https://discord.gg/YWrKVTn + about: Realtime support / chat with the community and the team. + + - name: Discourse discussion forum + url: https://discourse.linuxserver.io + about: Post on our community forum. + + - name: Documentation + url: https://docs.linuxserver.io/images/docker-bookstack + about: Documentation - information about all of our containers. diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md new file mode 100755 index 0000000..1d269c9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -0,0 +1,40 @@ +--- +name: Bug report +about: Create a report to help us improve + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + +------------------------------ + +## Expected Behavior + + +## Current Behavior + + +## Steps to Reproduce + + +1. +2. +3. +4. + +## Environment +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** + + + +## Command used to create docker container (run/create/compose/screenshot) + + +## Docker logs + diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md new file mode 100755 index 0000000..20a91fd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -0,0 +1,25 @@ +--- +name: Feature request +about: Suggest an idea for this project + +--- +[linuxserverurl]: https://linuxserver.io +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] + + + + + + + + +------------------------------ + +## Desired Behavior + + +## Current Behavior + + +## Alternatives Considered + diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100755 index 0000000..de9b7a4 --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,90 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name') + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for bookstack branch master" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/bookstack" + tag="latest" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbookstack%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') + IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') + if [ -z "${IMAGE_VERSION}" ]; then + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for bookstack tag latest" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + 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 ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --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}" + 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 }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100755 index 0000000..70dfeed --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '03 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml new file mode 100755 index 0000000..11c927a --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi + echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100755 index 0000000..135d5f1 --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,50 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '00 12 * * 0' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for bookstack** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bookstack/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} From 5d7a8dc077877fdda74b44ff7f4935150c4ab8d2 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 15 Dec 2020 18:57:20 -0600 Subject: [PATCH 039/452] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb06cb2..4ead2e3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -252,11 +252,11 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md + rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md + git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} From 78f4a9e2323846965570886332318a04f07c1c1f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 16 Dec 2020 01:00:00 +0000 Subject: [PATCH 040/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 1 + Jenkinsfile | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index de9b7a4..c0605e3 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -27,6 +27,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi + EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" echo "**** Retrieving last pushed version ****" image="linuxserver/bookstack" diff --git a/Jenkinsfile b/Jenkinsfile index 4ead2e3..c214cfd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -450,6 +450,13 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + sh '''#! /bin/bash + echo "Packages were updated. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -467,6 +474,13 @@ pipeline { } } steps { + sh '''#! /bin/bash + echo "There are no package updates. Cleaning up the image and exiting." + if [ "${MULTIARCH}" == "true" ]; then + docker rmi ${IMAGE}:amd64-${META_TAG} + else + docker rmi ${IMAGE}:${META_TAG} + fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -556,7 +570,7 @@ pipeline { ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ From ebb7fe79255c5683f9e3de85a9eacbb10c1685c0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 17 Dec 2020 12:42:35 -0500 Subject: [PATCH 041/452] make APP_URL required, detect changes --- README.md | 14 ++++++++------ readme-vars.yml | 14 ++++++++------ root/etc/cont-init.d/50-config | 25 +++++++++++++++++-------- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 4640dd8..3dfa5bb 100644 --- a/README.md +++ b/README.md @@ -75,11 +75,12 @@ Compatible with docker-compose v2 schemas. version: "2" services: bookstack: - image: linuxserver/bookstack + image: ghcr.io/linuxserver/bookstack container_name: bookstack environment: - PUID=1000 - PGID=1000 + - APP_URL= - DB_HOST=bookstack_db - DB_USER=bookstack - DB_PASS= @@ -92,7 +93,7 @@ services: depends_on: - bookstack_db bookstack_db: - image: linuxserver/mariadb + image: ghcr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 @@ -115,11 +116,11 @@ docker run -d \ --name=bookstack \ -e PUID=1000 \ -e PGID=1000 \ + -e APP_URL= \ -e DB_HOST= \ -e DB_USER= \ -e DB_PASS= \ -e DB_DATABASE=bookstackapp \ - -e APP_URL=http://your.site.here.xyz `#optional` \ -p 6875:80 \ -v /path/to/data:/config \ --restart unless-stopped \ @@ -136,11 +137,11 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 80` | will map the container's port 80 to port 6875 on the host | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | +| `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | | `-e DB_PASS=` | for specifying the database password | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | -| `-e APP_URL=http://your.site.here.xyz` | for specifying the url your application will be accessed on (required for correct operation of reverse proxy) | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) @@ -183,14 +184,14 @@ The default username is admin@admin.com with the password of **password**, acces This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. -If you intend to use this application behind a subfolder reverse proxy, such as our LetsEncrypt container or Traefik you will need to make sure that the `APP_URL` environment variable is set, or it will not work +If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. -When you create the container, do not set any arguments for any SQL settings, or APP_URL. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. +When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. #### PDF Rendering [wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. @@ -269,6 +270,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.12.20:** - Make APP_URL var required (upstream changes). * **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default. * **19.12.19:** - Rebasing to alpine 3.11. * **26.07.19:** - Use old version of tidyhtml pending upstream fixes. diff --git a/readme-vars.yml b/readme-vars.yml index 362fbf6..16e08fa 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -25,6 +25,7 @@ param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store any uploaded data on the docker host" } param_usage_include_env: true param_env_vars: + - { env_var: "APP_URL", env_value: "", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "", desc: "for specifying the database host" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } @@ -34,20 +35,20 @@ param_usage_include_ports: true param_ports: - { external_port: "6875", internal_port: "80", port_desc: "will map the container's port 80 to port 6875 on the host" } -opt_param_usage_include_env: true +opt_param_usage_include_env: false opt_param_env_vars: - - { env_var: "APP_URL", env_value: "http://your.site.here.xyz", desc: "for specifying the url your application will be accessed on (required for correct operation of reverse proxy)"} custom_compose: | --- version: "2" services: bookstack: - image: linuxserver/bookstack + image: ghcr.io/linuxserver/bookstack container_name: bookstack environment: - PUID=1000 - PGID=1000 + - APP_URL= - DB_HOST=bookstack_db - DB_USER=bookstack - DB_PASS= @@ -60,7 +61,7 @@ custom_compose: | depends_on: - bookstack_db bookstack_db: - image: linuxserver/mariadb + image: ghcr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 @@ -83,14 +84,14 @@ app_setup_block: | This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - If you intend to use this application behind a subfolder reverse proxy, such as our LetsEncrypt container or Traefik you will need to make sure that the `APP_URL` environment variable is set, or it will not work + If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. - When you create the container, do not set any arguments for any SQL settings, or APP_URL. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. + When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. #### PDF Rendering [wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. @@ -100,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." } - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index d512eef..3c999b4 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -57,19 +57,28 @@ if [ "${DB_USER}" ]; sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi -# set appurl if detected -[ -n "${APP_URL}" ] && sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env +# set appurl +if [ -z "${APP_URL}" ]; then + EXT_IP=$(curl -s https://icanhazip.com) + APP_URL="http://${EXT_IP}:6875" + echo "**** Docker env var APP_URL is not set, setting it to ${APP_URL} ****" +fi +OLD_URL=$(grep APP_URL /config/www/.env | sed 's|.*APP_URL=||g') +if [ "${APP_URL}" != "${OLD_URL}" ]; then + sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env + echo "**** APP_URL in /config/www/.env is being updated from ${OLD_URL} to ${APP_URL} ****" + if [ "${OLD_URL}" != "http://example.com" ]; then + echo "**** If this is an existing install, you should run the following line from your host terminal to update the database URL entries: ****" + echo "************************************************************************" + echo "docker exec -it bookstack php /var/www/html/artisan bookstack:update-url ${OLD_URL} ${APP_URL}" + echo "************************************************************************" + fi +fi ## Bump php upload max filesize and post max size to 100MB by default grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini grep -qx '^post_max_size.*$' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini - -## TODO: Remove this following bit by 12/19/2020 -# Remove erronously added configs post-init -sed -i "s/^upload_max_filesize = 100MB$//g" /config/php/php-local.ini -sed -i "s/^post_max_size = 100MB$//g" /config/php/php-local.ini - # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do From 7c6a213a5dd755deeef039f7ca0cfeb75919fec5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 20 Dec 2020 07:12:15 -0500 Subject: [PATCH 042/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f94b503..94afcbc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 -libcrypto1.1-1.1.1g-r0 +libcrypto1.1-1.1.1i-r0 libcurl-7.69.1-r3 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 @@ -72,7 +72,7 @@ libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 libseccomp-2.4.3-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1g-r0 +libssl1.1-1.1.1i-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 libtheora-1.1.1-r14 From d3a80807fdb2e944f8bccde07ebfd4a761474d2f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 10 Jan 2021 07:22:39 -0500 Subject: [PATCH 043/452] Bot Updating Package Versions --- package_versions.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 94afcbc..adc3aa8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -125,30 +125,30 @@ p11-kit-0.23.22-r0 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.25-r0 -php7-common-7.3.25-r0 -php7-ctype-7.3.25-r0 -php7-curl-7.3.25-r0 -php7-dom-7.3.25-r0 -php7-fileinfo-7.3.25-r0 -php7-fpm-7.3.25-r0 -php7-gd-7.3.25-r0 -php7-json-7.3.25-r0 -php7-ldap-7.3.25-r0 -php7-mbstring-7.3.25-r0 -php7-mysqlnd-7.3.25-r0 -php7-openssl-7.3.25-r0 -php7-pdo-7.3.25-r0 -php7-pdo_mysql-7.3.25-r0 +php7-7.3.26-r0 +php7-common-7.3.26-r0 +php7-ctype-7.3.26-r0 +php7-curl-7.3.26-r0 +php7-dom-7.3.26-r0 +php7-fileinfo-7.3.26-r0 +php7-fpm-7.3.26-r0 +php7-gd-7.3.26-r0 +php7-json-7.3.26-r0 +php7-ldap-7.3.26-r0 +php7-mbstring-7.3.26-r0 +php7-mysqlnd-7.3.26-r0 +php7-openssl-7.3.26-r0 +php7-pdo-7.3.26-r0 +php7-pdo_mysql-7.3.26-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.25-r0 -php7-session-7.3.25-r0 -php7-simplexml-7.3.25-r0 -php7-tidy-7.3.25-r0 -php7-tokenizer-7.3.25-r0 -php7-xml-7.3.25-r0 -php7-xmlwriter-7.3.25-r0 +php7-phar-7.3.26-r0 +php7-session-7.3.26-r0 +php7-simplexml-7.3.26-r0 +php7-tidy-7.3.26-r0 +php7-tokenizer-7.3.26-r0 +php7-xml-7.3.26-r0 +php7-xmlwriter-7.3.26-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 From 6c706bb69920e5a19d5c12e01529dd2ba64d34aa Mon Sep 17 00:00:00 2001 From: Roxedus Date: Tue, 12 Jan 2021 15:49:45 +0100 Subject: [PATCH 044/452] Remove unused requirement, as of release 0.31.0 --- .github/workflows/external_trigger.yml | 3 ++- .github/workflows/greetings.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- Dockerfile | 1 - Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - Jenkinsfile | 19 ++++++++++++++++++- README.md | 1 + readme-vars.yml | 1 + 9 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c0605e3..c8d9e74 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -22,8 +22,9 @@ jobs: if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for bookstack branch master" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-bookstack/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 62ece8c..50c5c26 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 135d5f1..e2b1b85 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '00 12 * * 0' + - cron: '51 15 * * 4' workflow_dispatch: jobs: diff --git a/Dockerfile b/Dockerfile index f4c9a1d..47049c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN \ php7-pdo_mysql \ php7-phar \ php7-simplexml \ - php7-tidy \ php7-tokenizer \ qt5-qtbase \ tar \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ca6a862..9839e58 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -29,7 +29,6 @@ RUN \ php7-pdo_mysql \ php7-phar \ php7-simplexml \ - php7-tidy \ php7-tokenizer \ qt5-qtbase \ tar \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6e2d6bb..e6eab63 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -29,7 +29,6 @@ RUN \ php7-pdo_mysql \ php7-phar \ php7-simplexml \ - php7-tidy \ php7-tokenizer \ qt5-qtbase \ tar \ diff --git a/Jenkinsfile b/Jenkinsfile index c214cfd..ff39c84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -265,13 +265,30 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + fi + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( diff --git a/README.md b/README.md index 3dfa5bb..cbcfa15 100644 --- a/README.md +++ b/README.md @@ -270,6 +270,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.01.21:** - Remove unused requirement, as of release 0.31.0. * **17.12.20:** - Make APP_URL var required (upstream changes). * **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default. * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/readme-vars.yml b/readme-vars.yml index 16e08fa..2183b26 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." } - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." } - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } From 23915eb3957a73954059cd13a70ba4371f9f1732 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Jan 2021 10:15:06 -0500 Subject: [PATCH 045/452] Bot Updating Package Versions --- package_versions.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index adc3aa8..d38c167 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -145,7 +145,6 @@ php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.26-r0 php7-session-7.3.26-r0 php7-simplexml-7.3.26-r0 -php7-tidy-7.3.26-r0 php7-tokenizer-7.3.26-r0 php7-xml-7.3.26-r0 php7-xmlwriter-7.3.26-r0 @@ -166,7 +165,6 @@ shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 -tidyhtml-libs-5.6.0-r0 ttf-freefont-20120503-r1 tzdata-2020c-r1 wayland-libs-client-1.18.0-r4 From 89c207e4076322210dfb87057959609b36f420ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 16 Jan 2021 19:07:32 +0000 Subject: [PATCH 046/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d38c167..2fa74a4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -166,7 +166,7 @@ sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 ttf-freefont-20120503-r1 -tzdata-2020c-r1 +tzdata-2020f-r0 wayland-libs-client-1.18.0-r4 wayland-libs-egl-1.18.0-r4 wayland-libs-server-1.18.0-r4 From 9b622e8d4429d2f9d624fb61815888562fe5347d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 6 Feb 2021 10:30:17 -0500 Subject: [PATCH 047/452] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2fa74a4..6724237 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -127,25 +127,25 @@ pcre-8.44-r0 pcre2-10.35-r0 php7-7.3.26-r0 php7-common-7.3.26-r0 -php7-ctype-7.3.26-r0 -php7-curl-7.3.26-r0 -php7-dom-7.3.26-r0 +php7-ctype-7.3.27-r0 +php7-curl-7.3.27-r0 +php7-dom-7.3.27-r0 php7-fileinfo-7.3.26-r0 php7-fpm-7.3.26-r0 -php7-gd-7.3.26-r0 +php7-gd-7.3.27-r0 php7-json-7.3.26-r0 -php7-ldap-7.3.26-r0 +php7-ldap-7.3.27-r0 php7-mbstring-7.3.26-r0 -php7-mysqlnd-7.3.26-r0 +php7-mysqlnd-7.3.27-r0 php7-openssl-7.3.26-r0 -php7-pdo-7.3.26-r0 -php7-pdo_mysql-7.3.26-r0 +php7-pdo-7.3.27-r0 +php7-pdo_mysql-7.3.27-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.26-r0 +php7-phar-7.3.27-r0 php7-session-7.3.26-r0 php7-simplexml-7.3.26-r0 -php7-tokenizer-7.3.26-r0 +php7-tokenizer-7.3.27-r0 php7-xml-7.3.26-r0 php7-xmlwriter-7.3.26-r0 pixman-0.40.0-r2 From 01927677b52e2186944d5376ff6244a49f3d70b9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Feb 2021 16:19:36 +0000 Subject: [PATCH 048/452] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6724237..6895b6b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,7 +70,7 @@ libproc-3.3.16-r0 libressl3.1-libcrypto-3.1.2-r0 libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 -libseccomp-2.4.3-r0 +libseccomp-2.4.4-r0 libsm-1.2.3-r0 libssl1.1-1.1.1i-r0 libstdc++-9.3.0-r2 @@ -125,29 +125,29 @@ p11-kit-0.23.22-r0 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.26-r0 -php7-common-7.3.26-r0 +php7-7.3.27-r0 +php7-common-7.3.27-r0 php7-ctype-7.3.27-r0 php7-curl-7.3.27-r0 php7-dom-7.3.27-r0 -php7-fileinfo-7.3.26-r0 -php7-fpm-7.3.26-r0 +php7-fileinfo-7.3.27-r0 +php7-fpm-7.3.27-r0 php7-gd-7.3.27-r0 -php7-json-7.3.26-r0 +php7-json-7.3.27-r0 php7-ldap-7.3.27-r0 -php7-mbstring-7.3.26-r0 +php7-mbstring-7.3.27-r0 php7-mysqlnd-7.3.27-r0 -php7-openssl-7.3.26-r0 +php7-openssl-7.3.27-r0 php7-pdo-7.3.27-r0 php7-pdo_mysql-7.3.27-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 php7-phar-7.3.27-r0 -php7-session-7.3.26-r0 -php7-simplexml-7.3.26-r0 +php7-session-7.3.27-r0 +php7-simplexml-7.3.27-r0 php7-tokenizer-7.3.27-r0 -php7-xml-7.3.26-r0 -php7-xmlwriter-7.3.26-r0 +php7-xml-7.3.27-r0 +php7-xmlwriter-7.3.27-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 @@ -166,7 +166,7 @@ sqlite-libs-3.32.1-r0 ssl_client-1.31.1-r19 tar-1.32-r1 ttf-freefont-20120503-r1 -tzdata-2020f-r0 +tzdata-2021a-r0 wayland-libs-client-1.18.0-r4 wayland-libs-egl-1.18.0-r4 wayland-libs-server-1.18.0-r4 From a9bc31d3e63d6060131e0b246fe89f0ac5a1cd0a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Feb 2021 16:07:01 +0000 Subject: [PATCH 049/452] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff39c84..4d72250 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -241,10 +241,53 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]]; then + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} @@ -252,11 +295,13 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - rm -f ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE.md cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi git add ${TEMPLATED_FILES} - git rm .github/ISSUE_TEMPLATE.md || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} @@ -265,8 +310,8 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' @@ -276,13 +321,13 @@ pipeline { git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, skipping Unraid template upload" else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' @@ -522,7 +567,7 @@ pipeline { } sh '''#! /bin/bash set -e - docker pull ghcr.io/linuxserver/lsiodev-ci:latest + docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} @@ -547,7 +592,7 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ - -t ghcr.io/linuxserver/lsiodev-ci:latest \ + -t ghcr.io/linuxserver/ci:latest \ python /ci/ci.py''' } } @@ -692,9 +737,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - echo "Pushing New tag for current commit ${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}" + echo "Pushing New tag for current commit ${META_TAG}" sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + -d '{"tag":"'${META_TAG}'",\ "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "type": "commit",\ @@ -702,9 +747,9 @@ pipeline { echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json - echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ - "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ + "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done @@ -731,7 +776,7 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/lsiodev-readme-sync + docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ -e DOCKERHUB_PASSWORD=$DOCKERPASS \ @@ -739,7 +784,7 @@ pipeline { -e DOCKER_REPOSITORY=${IMAGE} \ -e GIT_BRANCH=master \ -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/lsiodev-readme-sync bash -c 'node sync' + ghcr.io/linuxserver/readme-sync bash -c 'node sync' rm -Rf ${TEMPDIR} ''' } } From 6c95bd8dbf094704cfea9d603ce36847cd4b5bb6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Feb 2021 16:08:19 +0000 Subject: [PATCH 050/452] Bot Updating Templated Files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0e51313..1147a31 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ Network Trash Folder Temporary Items .apdisk docker-compose.yml +.jenkins-external From 4cca6cf57c3fe9d39d21f2b53dd1d86f9174861d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Feb 2021 16:15:36 +0000 Subject: [PATCH 051/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6895b6b..bab8de7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -118,7 +118,7 @@ netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1i-r0 +openssl-1.1.1j-r0 opus-1.3.1-r0 orc-0.4.31-r2 p11-kit-0.23.22-r0 From 1cbcff1fe9328aaa89894508ec9d5fc9887a89fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Feb 2021 16:06:39 +0000 Subject: [PATCH 052/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bab8de7..6bef3f9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 -libcrypto1.1-1.1.1i-r0 +libcrypto1.1-1.1.1j-r0 libcurl-7.69.1-r3 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 @@ -58,7 +58,7 @@ libice-1.0.10-r0 libinput-libs-1.15.5-r1 libintl-0.20.2-r0 libjpeg-turbo-2.0.5-r0 -libldap-2.4.50-r1 +libldap-2.4.50-r2 libmagic-5.38-r0 libmemcached-libs-1.0.18-r4 libmount-2.35.2-r0 @@ -72,7 +72,7 @@ libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 libseccomp-2.4.4-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1i-r0 +libssl1.1-1.1.1j-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 libtheora-1.1.1-r14 From 40811eecdec5e2f085099d657db283f6d8cbf453 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Mar 2021 11:04:23 -0500 Subject: [PATCH 053/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6bef3f9..0375f53 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -25,7 +25,7 @@ expat-2.2.9-r1 fontconfig-2.13.1-r2 freetype-2.10.4-r0 fribidi-1.0.9-r0 -git-2.26.2-r0 +git-2.26.3-r0 glib-2.64.6-r0 gmp-6.2.0-r0 gnutls-3.6.15-r0 From 842029ffb8e274362c6ad7b34df950d4caf3eda0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Mar 2021 12:08:42 -0400 Subject: [PATCH 054/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0375f53..f36ca98 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ fribidi-1.0.9-r0 git-2.26.3-r0 glib-2.64.6-r0 gmp-6.2.0-r0 -gnutls-3.6.15-r0 +gnutls-3.6.15-r1 graphite2-1.3.14-r0 gst-plugins-base-1.16.2-r3 gstreamer-1.16.2-r2 From 31d71344be150341180ecd139004c1ccf51795f3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 1 Apr 2021 12:07:24 -0400 Subject: [PATCH 055/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f36ca98..aeaf5e6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -43,7 +43,7 @@ libbsd-0.10.0-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 -libcrypto1.1-1.1.1j-r0 +libcrypto1.1-1.1.1k-r0 libcurl-7.69.1-r3 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 @@ -72,7 +72,7 @@ libressl3.1-libssl-3.1.2-r0 libsasl-2.1.27-r6 libseccomp-2.4.4-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1j-r0 +libssl1.1-1.1.1k-r0 libstdc++-9.3.0-r2 libtasn1-4.16.0-r1 libtheora-1.1.1-r14 @@ -118,7 +118,7 @@ netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 nginx-1.18.0-r1 -openssl-1.1.1j-r0 +openssl-1.1.1k-r0 opus-1.3.1-r0 orc-0.4.31-r2 p11-kit-0.23.22-r0 From 6f7e03cf00e27aa67cd999de2404436eb8de4d65 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Apr 2021 16:10:42 +0000 Subject: [PATCH 056/452] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aeaf5e6..2de8795 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,14 +2,14 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 alsa-lib-1.2.2-r0 apache2-utils-2.4.46-r1 -apk-tools-2.10.5-r1 +apk-tools-2.10.5-r3 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 avahi-libs-0.8-r0 bash-5.0.17-r0 brotli-libs-1.0.9-r1 -busybox-1.31.1-r19 +busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 cairo-1.16.0-r2 @@ -163,8 +163,8 @@ readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 sqlite-libs-3.32.1-r0 -ssl_client-1.31.1-r19 -tar-1.32-r1 +ssl_client-1.31.1-r20 +tar-1.32-r2 ttf-freefont-20120503-r1 tzdata-2021a-r0 wayland-libs-client-1.18.0-r4 From b52a3014d7e36eaf2d4ab458de75f563eedb6366 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 9 Apr 2021 16:35:09 -0400 Subject: [PATCH 057/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2de8795..1890bb2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ brotli-libs-1.0.9-r1 busybox-1.31.1-r20 ca-certificates-20191127-r4 ca-certificates-bundle-20191127-r4 -cairo-1.16.0-r2 +cairo-1.16.0-r3 cdparanoia-libs-10.2-r8 coreutils-8.32-r0 cups-libs-2.3.3-r0 From 73148b55d94228fa5592f7e88960d1a432f805c5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 16:03:02 +0000 Subject: [PATCH 058/452] Bot Updating Templated Files --- Jenkinsfile | 92 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4d72250..da2cd1e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/greetings.yml ./.github/workflows/stale.yml ./.github/workflows/package_trigger.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/external_trigger.yml ./.github/workflows/external_trigger_scheduler.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -106,7 +106,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', + script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''', returnStdout: true).trim() } } @@ -317,22 +317,24 @@ pipeline { git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi - mkdir -p ${TEMPDIR}/unraid + mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, skipping Unraid template upload" + echo "Image is on the ignore list, removing Unraid template" + git rm unraid/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Removing Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - cd ${TEMPDIR}/unraid/templates/ git add unraid/${CONTAINER_NAME}.xml git commit -m 'Bot Updating Unraid Template' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all fi rm -Rf ${TEMPDIR}''' script{ @@ -389,8 +391,21 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bookstack\" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } // Build MultiArch Docker containers for push to LS Repo @@ -403,8 +418,21 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bookstack\" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } stage('Build ARMHF') { @@ -417,8 +445,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bookstack\" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -438,8 +479,21 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh "docker build \ + --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ + --label \"org.opencontainers.image.authors=linuxserver.io\" \ + --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ + --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ + --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ + --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ + --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.vendor=linuxserver.io\" \ + --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ + --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ + --label \"org.opencontainers.image.title=Bookstack\" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -746,11 +800,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' @@ -775,7 +829,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest docker pull ghcr.io/linuxserver/readme-sync docker run --rm=true \ -e DOCKERHUB_USERNAME=$DOCKERUSER \ From 089cfd5eabed66fd7f70a9d0c89b6294eea9fe30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 16:04:36 +0000 Subject: [PATCH 059/452] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 7 ++-- README.md | 83 +++++++++++++++++++++-------------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 658522b..a009775 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the ### Testing your changes -``` +```bash git clone https://github.com/linuxserver/docker-bookstack.git cd docker-bookstack docker build \ @@ -106,13 +106,14 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. -## Update the chagelog +## Update the changelog If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-bookstack/tree/master/root), add an entry to the changelog diff --git a/README.md b/README.md index cbcfa15..da8cc27 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) @@ -12,13 +12,14 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring: - * regular and timely application updates - * easy user mappings (PGID, PUID) - * custom base image with s6 overlay - * weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth - * regular security updates +* regular and timely application updates +* easy user mappings (PGID, PUID) +* custom base image with s6 overlay +* weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth +* regular security updates 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://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. @@ -44,7 +45,6 @@ Powered by SQL and including a Markdown editor for those who prefer it, BookStac For more information on BookStack visit their website and check it out: https://www.bookstackapp.com - [![bookstack](https://s3-us-west-2.amazonaws.com/linuxserver-docs/images/bookstack-logo500x500.png)](https://github.com/BookStackApp/BookStack) ## Supported Architectures @@ -61,6 +61,27 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Application Setup + + +The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. + +This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. + + +If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work + +Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ + +### Advanced Users (full control over the .env file) +If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. + +When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. + +#### PDF Rendering +[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. + +The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`. ## Usage @@ -111,7 +132,7 @@ services: ### docker cli -``` +```bash docker run -d \ --name=bookstack \ -e PUID=1000 \ @@ -127,7 +148,6 @@ docker run -d \ ghcr.io/linuxserver/bookstack ``` - ## Parameters Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `:` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. @@ -150,7 +170,7 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: -``` +```bash -e FILE__PASSWORD=/run/secrets/mysecretpassword ``` @@ -169,42 +189,17 @@ Ensure any volume directories on the host are owned by the same user you specify In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: -``` +```bash $ id username uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) ``` - -  -## Application Setup - - -The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. - -This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - - -If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work - -Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ - -### Advanced Users (full control over the .env file) -If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. - -When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. - -#### PDF Rendering -[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. - -The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`. - - ## Docker Mods + [![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=bookstack&query=%24.mods%5B%27bookstack%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=bookstack "view available mods for this container.") [![Docker Universal Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=universal&query=%24.mods%5B%27universal%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=universal "view available universal mods.") We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) as well as universal mods that can be applied to any one of our images can be accessed via the dynamic badges above. - ## Support Info * Shell access whilst the container is running: `docker exec -it bookstack /bin/bash` @@ -221,6 +216,7 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Compose + * Update all images: `docker-compose pull` * or update a single image: `docker-compose pull bookstack` * Let compose update all containers as necessary: `docker-compose up -d` @@ -228,6 +224,7 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Docker Run + * Update the image: `docker pull ghcr.io/linuxserver/bookstack` * Stop the running container: `docker stop bookstack` * Delete the container: `docker rm bookstack` @@ -235,24 +232,29 @@ Below are the instructions for updating containers: * You can also remove the old dangling images: `docker image prune` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) + * Pull the latest image at its tag and replace it with the same env variables in one run: - ``` + + ```bash docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ containrrr/watchtower \ --run-once bookstack ``` + * You can also remove the old dangling images: `docker image prune` **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) + * We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally If you want to make local modifications to these images for development purposes or just to customize the logic: -``` + +```bash git clone https://github.com/linuxserver/docker-bookstack.git cd docker-bookstack docker build \ @@ -262,7 +264,8 @@ docker build \ ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` -``` + +```bash docker run --rm --privileged multiarch/qemu-user-static:register --reset ``` From 9e7566b69bc62677fabd8bd3cb93896a3a216d50 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Apr 2021 17:11:36 +0100 Subject: [PATCH 060/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1890bb2..1f37e2f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 alsa-lib-1.2.2-r0 apache2-utils-2.4.46-r1 -apk-tools-2.10.5-r3 +apk-tools-2.10.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 @@ -16,7 +16,7 @@ cairo-1.16.0-r3 cdparanoia-libs-10.2-r8 coreutils-8.32-r0 cups-libs-2.3.3-r0 -curl-7.69.1-r3 +curl-7.76.1-r0 db-5.3.28-r1 dbus-libs-1.12.18-r0 encodings-1.0.5-r0 @@ -44,7 +44,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 libcrypto1.1-1.1.1k-r0 -libcurl-7.69.1-r3 +libcurl-7.76.1-r0 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 libevdev-1.9.0-r0 From 80359a54cee862ad4d2b0b12774857f6240a1e3f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 19 Apr 2021 18:33:27 -0400 Subject: [PATCH 061/452] Bot Updating Templated Files --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index da8cc27..c423971 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,6 @@ The architectures supported by this image are: ## Application Setup - The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. From ed91128c6746ec77ef3a6402de745559144b80e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Apr 2021 22:33:18 +0100 Subject: [PATCH 062/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1f37e2f..9e45bb2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libgpg-error-1.37-r0 libice-1.0.10-r0 libinput-libs-1.15.5-r1 libintl-0.20.2-r0 -libjpeg-turbo-2.0.5-r0 +libjpeg-turbo-2.1.0-r0 libldap-2.4.50-r2 libmagic-5.38-r0 libmemcached-libs-1.0.18-r4 From 1bb71e0daf4833c75196605fb7b1b11c95f143a0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 May 2021 17:18:46 +0100 Subject: [PATCH 063/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9e45bb2..a5726bf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -81,7 +81,7 @@ libunistring-0.9.10-r0 libuuid-2.35.2-r0 libvorbis-1.3.6-r2 libwebp-1.1.0-r0 -libx11-1.6.12-r0 +libx11-1.6.12-r1 libxau-1.0.9-r0 libxcb-1.14-r1 libxdamage-1.1.5-r0 From fdb231bab24380160fc6ffd23b103d0a765b705d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 May 2021 12:33:13 -0400 Subject: [PATCH 064/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a5726bf..22b9fb8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ cairo-1.16.0-r3 cdparanoia-libs-10.2-r8 coreutils-8.32-r0 cups-libs-2.3.3-r0 -curl-7.76.1-r0 +curl-7.77.0-r0 db-5.3.28-r1 dbus-libs-1.12.18-r0 encodings-1.0.5-r0 @@ -44,7 +44,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.27-r0 libcrypto1.1-1.1.1k-r0 -libcurl-7.76.1-r0 +libcurl-7.77.0-r0 libdrm-2.4.102-r0 libedit-20191231.3.1-r0 libevdev-1.9.0-r0 @@ -117,7 +117,7 @@ ncurses-terminfo-base-6.2_p20200523-r0 netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r1 +nginx-1.18.0-r2 openssl-1.1.1k-r0 opus-1.3.1-r0 orc-0.4.31-r2 From 4a41e2a209a2632c688ed2b099f5101994aa7635 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Jun 2021 16:55:18 +0000 Subject: [PATCH 065/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 22b9fb8..14edc42 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -117,7 +117,7 @@ ncurses-terminfo-base-6.2_p20200523-r0 netcat-openbsd-1.130-r1 nettle-3.5.1-r1 nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r2 +nginx-1.18.0-r3 openssl-1.1.1k-r0 opus-1.3.1-r0 orc-0.4.31-r2 From 14b05b93b6a362d2af4df7156c18fe94abc09036 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Jun 2021 23:03:57 +0000 Subject: [PATCH 066/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 14edc42..c99acb2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -162,7 +162,7 @@ qt5-qtwebkit-5.212.0_alpha4-r11 readline-8.0.4-r0 scanelf-1.2.6-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r0 +sqlite-libs-3.32.1-r1 ssl_client-1.31.1-r20 tar-1.32-r2 ttf-freefont-20120503-r1 From 2b230fb5f9db875f4dc84bb2e9984ccaba37be83 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 7 Jun 2021 16:12:00 +0100 Subject: [PATCH 067/452] Check for zero length .env on startup --- root/etc/cont-init.d/50-config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 3c999b4..0dd0e6f 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -8,6 +8,10 @@ mkdir -p \ [[ ! -f "/config/www/.env" ]] && \ cp /var/www/html/.env.example /config/www/.env +# check for zero-length .env and alert user if found +[[ ! -s "/config/www/.env" ]] && \ + echo "WARNING: zero-length .env file detected. Please delete /config/www/.env and restart the container" + # create symlinks symlinks=( \ /var/www/html/storage/uploads/files \ From 99fca5fec230c03ae545f7c61ffbbe6989f0297b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Jun 2021 16:14:28 +0000 Subject: [PATCH 068/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c99acb2..9a0a95e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -91,7 +91,7 @@ libxfixes-5.0.3-r2 libxft-2.3.3-r0 libxkbcommon-0.10.0-r1 libxkbcommon-x11-0.10.0-r1 -libxml2-2.9.10-r5 +libxml2-2.9.10-r6 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r1 From 250e42f96af1da1c099d9e96332737278a0e337a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Jun 2021 12:09:31 -0400 Subject: [PATCH 069/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9a0a95e..376b140 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r7 alpine-keys-2.2-r0 alsa-lib-1.2.2-r0 -apache2-utils-2.4.46-r1 +apache2-utils-2.4.48-r0 apk-tools-2.10.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 From 387c8dfe83768b6c6b8ecb359d290e49ef62f571 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Jun 2021 16:03:28 +0000 Subject: [PATCH 070/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 376b140..44a986e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ apk-tools-2.10.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r6 argon2-libs-20190702-r1 -avahi-libs-0.8-r0 +avahi-libs-0.8-r1 bash-5.0.17-r0 brotli-libs-1.0.9-r1 busybox-1.31.1-r20 From 1040cdecbbd34f61601e0636597ab4e4629c44f3 Mon Sep 17 00:00:00 2001 From: Matt Jolly Date: Tue, 29 Jun 2021 14:45:54 +1000 Subject: [PATCH 071/452] Escape special characters in DB_PASS environment variable when substituting with sed Characters: - / - \ - $ - & --- root/etc/cont-init.d/50-config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0dd0e6f..89243bb 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -55,10 +55,11 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" + ESCAPED_PASSWORD=$(sed -e 's/[$\/&]/\\&/g' <<< $DB_PASS) sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /config/www/.env + sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env fi # set appurl From f633917892e7ec429681c01124048a2afa5e81d2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 1 Jul 2021 12:14:14 -0400 Subject: [PATCH 072/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 44a986e..b07a437 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libevent-2.1.11-r1 libffi-3.3-r2 libfontenc-1.1.4-r0 libgcc-9.3.0-r2 -libgcrypt-1.8.5-r0 +libgcrypt-1.8.8-r0 libgpg-error-1.37-r0 libice-1.0.10-r0 libinput-libs-1.15.5-r1 From aaa53775eeb805fe8a2eba560fe6ac0bbc7a6ff6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Jul 2021 11:19:42 +0000 Subject: [PATCH 073/452] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index da2cd1e..f6fec88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -270,7 +270,6 @@ pipeline { git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} cd ${TEMPDIR}/repo/${LS_REPO} git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} for i in ${TEMPLATES_TO_DELETE}; do git rm "${i}" done @@ -531,6 +530,15 @@ pipeline { apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "fedora" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + rpm -qa > /tmp/package_versions.txt && \ + sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' + elif [ "${DIST_IMAGE}" == "arch" ]; then + docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ + pacman -Q > /tmp/package_versions.txt && \ + chmod 777 /tmp/package_versions.txt' fi 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" From 724eee5a7cb1ab40fa1ddedef5dab3e540edd775 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 3 Jul 2021 11:21:03 +0000 Subject: [PATCH 074/452] Bot Updating Templated Files --- .editorconfig | 20 ++++++++++++++++++++ .github/CONTRIBUTING.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/stale.yml | 2 +- README.md | 7 ++----- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100755 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100755 index 0000000..a92f7df --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# This file is globally distributed to all container image projects from +# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = true +# trim_trailing_whitespace may cause unintended issues and should not be globally set true +trim_trailing_whitespace = false + +[{Dockerfile*,**.yml}] +indent_style = space +indent_size = 2 + +[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a009775..fd5e806 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -4,7 +4,7 @@ * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open. * Read, and fill the Pull Request template - * If this is a fix for a typo in code or documentation in the README please file an issue + * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ca9b100..0364628 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ - + diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 1806420..3b3846e 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v1 + - uses: actions/stale@v3 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." diff --git a/README.md b/README.md index c423971..6cf2779 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bookstack/container_registry) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/bookstack "Get your own version badge on microbadger.com") [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) @@ -86,9 +85,7 @@ The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/ Here are some example snippets to help you get started creating a container. -### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose)) - -Compatible with docker-compose v2 schemas. +### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml --- @@ -129,7 +126,7 @@ services: ``` -### docker cli +### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) ```bash docker run -d \ From 5a4c8ec4564e58542c3027a113b442035b9ab4e4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Jul 2021 16:21:52 +0000 Subject: [PATCH 075/452] Bot Updating Package Versions --- package_versions.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b07a437..a61263e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -125,29 +125,29 @@ p11-kit-0.23.22-r0 pango-1.44.7-r2 pcre-8.44-r0 pcre2-10.35-r0 -php7-7.3.27-r0 -php7-common-7.3.27-r0 -php7-ctype-7.3.27-r0 -php7-curl-7.3.27-r0 -php7-dom-7.3.27-r0 -php7-fileinfo-7.3.27-r0 -php7-fpm-7.3.27-r0 -php7-gd-7.3.27-r0 -php7-json-7.3.27-r0 -php7-ldap-7.3.27-r0 -php7-mbstring-7.3.27-r0 -php7-mysqlnd-7.3.27-r0 -php7-openssl-7.3.27-r0 -php7-pdo-7.3.27-r0 -php7-pdo_mysql-7.3.27-r0 +php7-7.3.29-r0 +php7-common-7.3.29-r0 +php7-ctype-7.3.29-r0 +php7-curl-7.3.29-r0 +php7-dom-7.3.29-r0 +php7-fileinfo-7.3.29-r0 +php7-fpm-7.3.29-r0 +php7-gd-7.3.29-r0 +php7-json-7.3.29-r0 +php7-ldap-7.3.29-r0 +php7-mbstring-7.3.29-r0 +php7-mysqlnd-7.3.29-r0 +php7-openssl-7.3.29-r0 +php7-pdo-7.3.29-r0 +php7-pdo_mysql-7.3.29-r0 php7-pecl-igbinary-3.1.6-r0 php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.27-r0 -php7-session-7.3.27-r0 -php7-simplexml-7.3.27-r0 -php7-tokenizer-7.3.27-r0 -php7-xml-7.3.27-r0 -php7-xmlwriter-7.3.27-r0 +php7-phar-7.3.29-r0 +php7-session-7.3.29-r0 +php7-simplexml-7.3.29-r0 +php7-tokenizer-7.3.29-r0 +php7-xml-7.3.29-r0 +php7-xmlwriter-7.3.29-r0 pixman-0.40.0-r2 popt-1.16-r7 procps-3.3.16-r0 From 922d6d1fd747cb5eb7273b8a812ea6a005ea2ab5 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 9 Jul 2021 19:40:04 +0100 Subject: [PATCH 076/452] Parallelise /var/www chown to speed it up Should help with machines affected by overlay cow bug --- root/etc/cont-init.d/50-config | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0dd0e6f..3b57a9a 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -105,8 +105,10 @@ fi # set permissions chown -R abc:abc \ - /config \ - /var/www/ + /config + +find /var/www -print0 | xargs -P "$(nproc)" -I {} -0 chown -h abc:abc {} +find /var/www -print0 -type d | xargs -P "$(nproc)" -I {} -0 chown -h abc:abc {} # set lockfile to avoid DB waits for this specific container touch /dbwait.lock From 98942d5aaa3e8665ca32e8d779c9d1856796cbfe Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 11 Jul 2021 20:01:23 +0100 Subject: [PATCH 077/452] Rebase to 3.14 --- Dockerfile | 105 +++++++++++++++++++++------------------------ Dockerfile.aarch64 | 105 +++++++++++++++++++++------------------------ Dockerfile.armhf | 100 +++++++++++++++++++++--------------------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 148 insertions(+), 168 deletions(-) diff --git a/Dockerfile b/Dockerfile index 47049c8..33bc0d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 # set version label ARG BUILD_DATE @@ -11,63 +11,54 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - fontconfig \ - memcached \ - netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ - qt5-qtbase \ - tar \ - ttf-freefont \ - wkhtmltopdf && \ - echo "**** tidy bug fix ****" && \ - curl -s \ - http://dl-cdn.alpinelinux.org/alpine/v3.7/community/x86_64/tidyhtml-libs-5.4.0-r0.apk | \ - tar xfz - -C / && \ - rm -f /usr/lib/libtidy.so.5.6.0 && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ - echo "**** fetch bookstack ****" && \ - mkdir -p\ - /var/www/html && \ - if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ - BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/bookstack.tar.gz -L \ - "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ - echo "**** install composer ****" && \ - cd /tmp && \ - curl -sS https://getcomposer.org/installer | php && \ - mv /tmp/composer.phar /usr/local/bin/composer && \ - echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /root/.composer \ - /tmp/* + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + composer \ + fontconfig \ + memcached \ + netcat-openbsd \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-gd \ + php7-ldap \ + php7-mbstring \ + php7-memcached \ + php7-mysqlnd \ + php7-openssl \ + php7-pdo_mysql \ + php7-phar \ + php7-simplexml \ + php7-tokenizer \ + qt5-qtbase \ + tar \ + ttf-freefont \ + wkhtmltopdf && \ + echo "**** configure php-fpm ****" && \ + sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** fetch bookstack ****" && \ + mkdir -p\ + /var/www/html && \ + if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ + BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/bookstack.tar.gz -L \ + "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/bookstack.tar.gz -C \ + /var/www/html/ --strip-components=1 && \ + echo "**** install composer dependencies ****" && \ + composer install -d /var/www/html/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /root/.composer \ + /tmp/* -# copy local files COPY root/ / -# ports and volumes VOLUME /config +EXPOSE 80 \ No newline at end of file diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9839e58..201c014 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 # set version label ARG BUILD_DATE @@ -11,63 +11,54 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - fontconfig \ - memcached \ - netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ - qt5-qtbase \ - tar \ - ttf-freefont \ - wkhtmltopdf && \ - echo "**** tidy bug fix ****" && \ - curl -s \ - http://dl-cdn.alpinelinux.org/alpine/v3.7/community/aarch64/tidyhtml-libs-5.4.0-r0.apk | \ - tar xfz - -C / && \ - rm -f /usr/lib/libtidy.so.5.6.0 && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ - echo "**** fetch bookstack ****" && \ - mkdir -p\ - /var/www/html && \ - if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ - BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/bookstack.tar.gz -L \ - "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ - echo "**** install composer ****" && \ - cd /tmp && \ - curl -sS https://getcomposer.org/installer | php && \ - mv /tmp/composer.phar /usr/local/bin/composer && \ - echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /root/.composer \ - /tmp/* + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + composer \ + fontconfig \ + memcached \ + netcat-openbsd \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-gd \ + php7-ldap \ + php7-mbstring \ + php7-memcached \ + php7-mysqlnd \ + php7-openssl \ + php7-pdo_mysql \ + php7-phar \ + php7-simplexml \ + php7-tokenizer \ + qt5-qtbase \ + tar \ + ttf-freefont \ + wkhtmltopdf && \ + echo "**** configure php-fpm ****" && \ + sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** fetch bookstack ****" && \ + mkdir -p\ + /var/www/html && \ + if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ + BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/bookstack.tar.gz -L \ + "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/bookstack.tar.gz -C \ + /var/www/html/ --strip-components=1 && \ + echo "**** install composer dependencies ****" && \ + composer install -d /var/www/html/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /root/.composer \ + /tmp/* -# copy local files COPY root/ / -# ports and volumes VOLUME /config +EXPOSE 80 \ No newline at end of file diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e6eab63..d42b146 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -11,58 +11,54 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl \ - fontconfig \ - memcached \ - netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ - qt5-qtbase \ - tar \ - ttf-freefont \ - wkhtmltopdf && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ - echo "**** fetch bookstack ****" && \ - mkdir -p\ - /var/www/html && \ - if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ - BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/bookstack.tar.gz -L \ - "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ - echo "**** install composer ****" && \ - cd /tmp && \ - curl -sS https://getcomposer.org/installer | php && \ - mv /tmp/composer.phar /usr/local/bin/composer && \ - echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ - echo "**** cleanup ****" && \ - rm -rf \ - /root/.composer \ - /tmp/* + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + composer \ + fontconfig \ + memcached \ + netcat-openbsd \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-gd \ + php7-ldap \ + php7-mbstring \ + php7-memcached \ + php7-mysqlnd \ + php7-openssl \ + php7-pdo_mysql \ + php7-phar \ + php7-simplexml \ + php7-tokenizer \ + qt5-qtbase \ + tar \ + ttf-freefont \ + wkhtmltopdf && \ + echo "**** configure php-fpm ****" && \ + sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** fetch bookstack ****" && \ + mkdir -p\ + /var/www/html && \ + if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ + BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + fi && \ + curl -o \ + /tmp/bookstack.tar.gz -L \ + "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ + tar xf \ + /tmp/bookstack.tar.gz -C \ + /var/www/html/ --strip-components=1 && \ + echo "**** install composer dependencies ****" && \ + composer install -d /var/www/html/ && \ + echo "**** cleanup ****" && \ + rm -rf \ + /root/.composer \ + /tmp/* -# copy local files COPY root/ / -# ports and volumes VOLUME /config +EXPOSE 80 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index f6fec88..c517c0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DIST_IMAGE = 'alpine' MULTIARCH = 'true' CI = 'true' - CI_WEB = 'false' + CI_WEB = 'true' CI_PORT = '80' CI_SSL = 'false' CI_DELAY = '30' diff --git a/README.md b/README.md index 6cf2779..997006f 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.07.21:** - Rebase to Alpine 3.14. * **12.01.21:** - Remove unused requirement, as of release 0.31.0. * **17.12.20:** - Make APP_URL var required (upstream changes). * **17.09.20:** - Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 69a2c9c..847d1d0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - DIST_IMAGE = 'alpine' - MULTIARCH = 'true' - CI = 'true' - - CI_WEB = 'false' + - CI_WEB = 'true' - CI_PORT = '80' - CI_SSL = 'false' - CI_DELAY = '30' diff --git a/readme-vars.yml b/readme-vars.yml index 2183b26..e176dbd 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." } - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." } - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." } From 51adb5cf09185fa98f89078cee4ad15ac8ac2693 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 11 Jul 2021 21:20:25 +0100 Subject: [PATCH 078/452] Disable web check Webui won't come up without a valid DB to connect to. --- jenkins-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 847d1d0..69a2c9c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - DIST_IMAGE = 'alpine' - MULTIARCH = 'true' - CI = 'true' - - CI_WEB = 'true' + - CI_WEB = 'false' - CI_PORT = '80' - CI_SSL = 'false' - CI_DELAY = '30' From aa41e222b44484a1f976fe32ae2bf99f5f12b47a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 12 Jul 2021 08:18:10 +0000 Subject: [PATCH 079/452] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c517c0b..f6fec88 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DIST_IMAGE = 'alpine' MULTIARCH = 'true' CI = 'true' - CI_WEB = 'true' + CI_WEB = 'false' CI_PORT = '80' CI_SSL = 'false' CI_DELAY = '30' From da7880db56ca38f4ef637d0cd01c8c3ecbcef4fb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 12 Jul 2021 08:21:23 +0000 Subject: [PATCH 080/452] Bot Updating Package Versions --- package_versions.txt | 282 +++++++++++++++++++++++-------------------- 1 file changed, 148 insertions(+), 134 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a61263e..6580e52 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,181 +1,195 @@ -alpine-baselayout-3.2.0-r7 -alpine-keys-2.2-r0 -alsa-lib-1.2.2-r0 +alpine-baselayout-3.2.0-r15 +alpine-keys-2.3-r1 +alsa-lib-1.2.5-r2 apache2-utils-2.4.48-r0 -apk-tools-2.10.6-r0 +apk-tools-2.12.5-r1 apr-1.7.0-r0 -apr-util-1.6.1-r6 +apr-util-1.6.1-r7 argon2-libs-20190702-r1 -avahi-libs-0.8-r1 -bash-5.0.17-r0 -brotli-libs-1.0.9-r1 -busybox-1.31.1-r20 -ca-certificates-20191127-r4 -ca-certificates-bundle-20191127-r4 +avahi-libs-0.8-r4 +bash-5.1.4-r0 +brotli-libs-1.0.9-r5 +busybox-1.33.1-r3 +ca-certificates-20191127-r5 +ca-certificates-bundle-20191127-r5 cairo-1.16.0-r3 -cdparanoia-libs-10.2-r8 -coreutils-8.32-r0 -cups-libs-2.3.3-r0 -curl-7.77.0-r0 -db-5.3.28-r1 -dbus-libs-1.12.18-r0 +cdparanoia-libs-10.2-r9 +composer-2.1.3-r0 +coreutils-8.32-r2 +cups-libs-2.3.3-r2 +curl-7.77.0-r1 +dbus-libs-1.12.20-r2 encodings-1.0.5-r0 -eudev-libs-3.2.9-r3 -expat-2.2.9-r1 -fontconfig-2.13.1-r2 -freetype-2.10.4-r0 -fribidi-1.0.9-r0 -git-2.26.3-r0 -glib-2.64.6-r0 -gmp-6.2.0-r0 -gnutls-3.6.15-r1 +eudev-libs-3.2.10-r0 +expat-2.4.1-r0 +fontconfig-2.13.1-r4 +freetype-2.10.4-r1 +fribidi-1.0.10-r0 +gdbm-1.19-r0 +git-2.32.0-r0 +glib-2.68.2-r0 +gmp-6.2.1-r0 +gnutls-3.7.1-r0 graphite2-1.3.14-r0 -gst-plugins-base-1.16.2-r3 -gstreamer-1.16.2-r2 -harfbuzz-2.6.6-r0 +gst-plugins-base-1.18.4-r0 +gstreamer-1.18.4-r0 +harfbuzz-2.8.1-r0 hicolor-icon-theme-0.17-r1 hyphen-2.8.8-r1 -icu-libs-67.1-r0 +icu-libs-67.1-r2 libacl-2.2.53-r0 -libattr-2.4.48-r0 -libblkid-2.35.2-r0 -libbsd-0.10.0-r0 +libattr-2.5.1-r0 +libblkid-2.37-r0 +libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcap-2.27-r0 +libcap-2.50-r0 libcrypto1.1-1.1.1k-r0 -libcurl-7.77.0-r0 -libdrm-2.4.102-r0 -libedit-20191231.3.1-r0 -libevdev-1.9.0-r0 -libevent-2.1.11-r1 +libcurl-7.77.0-r1 +libdrm-2.4.106-r0 +libedit-20210216.3.1-r0 +libevdev-1.11.0-r1 +libevent-2.1.12-r2 libffi-3.3-r2 libfontenc-1.1.4-r0 -libgcc-9.3.0-r2 -libgcrypt-1.8.8-r0 -libgpg-error-1.37-r0 +libgcc-10.3.1_git20210424-r2 +libgcrypt-1.9.3-r0 +libgpg-error-1.42-r0 libice-1.0.10-r0 -libinput-libs-1.15.5-r1 -libintl-0.20.2-r0 +libinput-libs-1.18.0-r0 +libintl-0.21-r0 libjpeg-turbo-2.1.0-r0 -libldap-2.4.50-r2 -libmagic-5.38-r0 +libldap-2.4.58-r0 +libmagic-5.40-r1 +libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 -libmount-2.35.2-r0 -libogg-1.3.4-r0 +libmount-2.37-r0 +libogg-1.3.5-r0 libpciaccess-0.16-r0 -libpcre2-16-10.35-r0 +libpcre2-16-10.36-r0 libpng-1.6.37-r1 -libproc-3.3.16-r0 -libressl3.1-libcrypto-3.1.2-r0 -libressl3.1-libssl-3.1.2-r0 -libsasl-2.1.27-r6 -libseccomp-2.4.4-r0 +libproc-3.3.17-r0 +libressl3.3-libcrypto-3.3.3-r0 +libressl3.3-libssl-3.3.3-r0 +libretls-3.3.3-r2 +libsasl-2.1.27-r12 +libseccomp-2.5.1-r2 libsm-1.2.3-r0 libssl1.1-1.1.1k-r0 -libstdc++-9.3.0-r2 -libtasn1-4.16.0-r1 -libtheora-1.1.1-r14 -libtls-standalone-2.9.1-r1 -libunistring-0.9.10-r0 -libuuid-2.35.2-r0 -libvorbis-1.3.6-r2 -libwebp-1.1.0-r0 -libx11-1.6.12-r1 +libstdc++-10.3.1_git20210424-r2 +libtasn1-4.17.0-r0 +libtheora-1.1.1-r16 +libunistring-0.9.10-r1 +libuuid-2.37-r0 +libvorbis-1.3.7-r0 +libwebp-1.2.0-r2 +libx11-1.7.2-r0 libxau-1.0.9-r0 -libxcb-1.14-r1 -libxdamage-1.1.5-r0 +libxcb-1.14-r2 +libxcomposite-0.4.5-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxfixes-5.0.3-r2 +libxfixes-6.0.0-r0 libxft-2.3.3-r0 -libxkbcommon-0.10.0-r1 -libxkbcommon-x11-0.10.0-r1 -libxml2-2.9.10-r6 +libxkbcommon-1.2.1-r0 +libxkbcommon-x11-1.2.1-r0 +libxml2-2.9.12-r1 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r1 -libxslt-1.1.34-r0 -libxt-1.2.0-r0 +libxslt-1.1.34-r1 +libxt-1.2.1-r0 libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 -linux-pam-1.3.1-r4 -logrotate-3.16.0-r0 -memcached-1.6.6-r0 -mesa-20.0.7-r0 -mesa-egl-20.0.7-r0 -mesa-gbm-20.0.7-r0 -mesa-gl-20.0.7-r0 -mesa-glapi-20.0.7-r0 +libzip-1.7.3-r2 +linux-pam-1.5.1-r1 +logrotate-3.18.1-r0 +memcached-1.6.9-r0 +mesa-21.1.2-r0 +mesa-egl-21.1.2-r0 +mesa-gbm-21.1.2-r0 +mesa-gl-21.1.2-r0 +mesa-glapi-21.1.2-r0 mkfontscale-1.2.1-r1 mtdev-1.1.6-r0 -musl-1.1.24-r10 -musl-utils-1.1.24-r10 -nano-4.9.3-r0 -ncurses-libs-6.2_p20200523-r0 -ncurses-terminfo-base-6.2_p20200523-r0 -netcat-openbsd-1.130-r1 -nettle-3.5.1-r1 -nghttp2-libs-1.41.0-r0 -nginx-1.18.0-r3 +musl-1.2.2-r3 +musl-utils-1.2.2-r3 +nano-5.7-r2 +ncurses-libs-6.2_p20210612-r0 +ncurses-terminfo-base-6.2_p20210612-r0 +netcat-openbsd-1.130-r2 +nettle-3.7.2-r0 +nghttp2-libs-1.43.0-r0 +nginx-1.20.1-r3 +oniguruma-6.9.7.1-r0 openssl-1.1.1k-r0 -opus-1.3.1-r0 -orc-0.4.31-r2 +opus-1.3.1-r1 +orc-0.4.32-r0 p11-kit-0.23.22-r0 -pango-1.44.7-r2 +pango-1.48.5-r0 pcre-8.44-r0 -pcre2-10.35-r0 -php7-7.3.29-r0 -php7-common-7.3.29-r0 -php7-ctype-7.3.29-r0 -php7-curl-7.3.29-r0 -php7-dom-7.3.29-r0 -php7-fileinfo-7.3.29-r0 -php7-fpm-7.3.29-r0 -php7-gd-7.3.29-r0 -php7-json-7.3.29-r0 -php7-ldap-7.3.29-r0 -php7-mbstring-7.3.29-r0 -php7-mysqlnd-7.3.29-r0 -php7-openssl-7.3.29-r0 -php7-pdo-7.3.29-r0 -php7-pdo_mysql-7.3.29-r0 -php7-pecl-igbinary-3.1.6-r0 -php7-pecl-memcached-3.1.5-r0 -php7-phar-7.3.29-r0 -php7-session-7.3.29-r0 -php7-simplexml-7.3.29-r0 -php7-tokenizer-7.3.29-r0 -php7-xml-7.3.29-r0 -php7-xmlwriter-7.3.29-r0 +pcre2-10.36-r0 +php7-7.4.21-r0 +php7-common-7.4.21-r0 +php7-ctype-7.4.21-r0 +php7-curl-7.4.21-r0 +php7-dom-7.4.21-r0 +php7-fileinfo-7.4.21-r0 +php7-fpm-7.4.21-r0 +php7-gd-7.4.21-r0 +php7-iconv-7.4.21-r0 +php7-json-7.4.21-r0 +php7-ldap-7.4.21-r0 +php7-mbstring-7.4.21-r0 +php7-mysqlnd-7.4.21-r0 +php7-openssl-7.4.21-r0 +php7-pdo-7.4.21-r0 +php7-pdo_mysql-7.4.21-r0 +php7-pecl-igbinary-3.2.3-r0 +php7-pecl-memcached-3.1.5-r2 +php7-phar-7.4.21-r0 +php7-session-7.4.21-r0 +php7-simplexml-7.4.21-r0 +php7-tokenizer-7.4.21-r0 +php7-xml-7.4.21-r0 +php7-xmlwriter-7.4.21-r0 +php7-zip-7.4.21-r0 pixman-0.40.0-r2 -popt-1.16-r7 -procps-3.3.16-r0 -qt5-qtbase-5.14.2-r1 -qt5-qtbase-x11-5.14.2-r1 -qt5-qtdeclarative-5.14.2-r0 -qt5-qtlocation-5.14.2-r0 -qt5-qtsensors-5.14.2-r0 -qt5-qtsvg-5.14.2-r0 -qt5-qtwebchannel-5.14.2-r0 -qt5-qtwebkit-5.212.0_alpha4-r11 -readline-8.0.4-r0 -scanelf-1.2.6-r0 +pkgconf-1.7.4-r0 +popt-1.18-r0 +procps-3.3.17-r0 +qt5-qtbase-5.15.3_git20210406-r0 +qt5-qtbase-x11-5.15.3_git20210406-r0 +qt5-qtdeclarative-5.15.3_git20210531-r0 +qt5-qtlocation-5.15.3_git20201109-r0 +qt5-qtsensors-5.15.3_git20201028-r1 +qt5-qtsvg-5.15.3_git20200406-r0 +qt5-qtwayland-5.15.3_git20210510-r0 +qt5-qtwebchannel-5.15.3_git20201028-r0 +qt5-qtwebkit-5.212.0_alpha4-r14 +readline-8.1.0-r0 +s6-ipcserver-2.10.0.3-r0 +scanelf-1.3.2-r0 shadow-4.8.1-r0 -sqlite-libs-3.32.1-r1 -ssl_client-1.31.1-r20 -tar-1.32-r2 +skalibs-2.10.0.3-r0 +sqlite-libs-3.35.5-r0 +ssl_client-1.33.1-r3 +tar-1.34-r0 ttf-freefont-20120503-r1 tzdata-2021a-r0 -wayland-libs-client-1.18.0-r4 -wayland-libs-egl-1.18.0-r4 -wayland-libs-server-1.18.0-r4 -wkhtmltopdf-0.12.5-r1 +utmps-0.1.0.2-r0 +wayland-libs-client-1.19.0-r0 +wayland-libs-cursor-1.19.0-r0 +wayland-libs-egl-1.19.0-r0 +wayland-libs-server-1.19.0-r0 +wkhtmltopdf-0.12.6-r0 xcb-util-0.4.0-r3 xcb-util-image-0.4.0-r1 xcb-util-keysyms-0.4.0-r1 xcb-util-renderutil-0.3.9-r1 xcb-util-wm-0.4.1-r1 +xkeyboard-config-2.33-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 zlib-1.2.11-r3 +zstd-libs-1.4.9-r1 From 08c8fdb44c71e12b3916d6d5674154a1ac9e2066 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Jul 2021 16:01:20 +0000 Subject: [PATCH 081/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6580e52..2e626a5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,4 +1,4 @@ -alpine-baselayout-3.2.0-r15 +alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 apache2-utils-2.4.48-r0 From 6b7889860b190b542c2c41e13c38cef2a3090b70 Mon Sep 17 00:00:00 2001 From: homerr <19776252+homerr@users.noreply.github.com> Date: Fri, 16 Jul 2021 09:15:40 +0100 Subject: [PATCH 082/452] corrected typo --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index e176dbd..47ba42a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,7 +6,7 @@ project_url: "https://github.com/BookStackApp/BookStack" project_logo: "https://s3-us-west-2.amazonaws.com/linuxserver-docs/images/bookstack-logo500x500.png" project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb: | - [{{ project_name|capitalize }}]({{ project_url }}) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. + [{{ project_name|capitalize }}]({{ project_url }}) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. From 2a666334cc832f8f6e63e127d968c13e893b6024 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Jul 2021 18:01:15 +0200 Subject: [PATCH 083/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2e626a5..61f48e4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ apk-tools-2.12.5-r1 apr-1.7.0-r0 apr-util-1.6.1-r7 argon2-libs-20190702-r1 -avahi-libs-0.8-r4 +avahi-libs-0.8-r5 bash-5.1.4-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r3 From 17e5df57589112bc2afd0dcb20b6a06b2d4d1fcd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 29 Jul 2021 18:01:33 +0200 Subject: [PATCH 084/452] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 61f48e4..45f2128 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ cdparanoia-libs-10.2-r9 composer-2.1.3-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 -curl-7.77.0-r1 +curl-7.78.0-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 @@ -27,7 +27,7 @@ freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 git-2.32.0-r0 -glib-2.68.2-r0 +glib-2.68.3-r0 gmp-6.2.1-r0 gnutls-3.7.1-r0 graphite2-1.3.14-r0 @@ -45,7 +45,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 libcrypto1.1-1.1.1k-r0 -libcurl-7.77.0-r1 +libcurl-7.78.0-r0 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 libevdev-1.11.0-r1 @@ -145,7 +145,7 @@ php7-mysqlnd-7.4.21-r0 php7-openssl-7.4.21-r0 php7-pdo-7.4.21-r0 php7-pdo_mysql-7.4.21-r0 -php7-pecl-igbinary-3.2.3-r0 +php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 php7-phar-7.4.21-r0 php7-session-7.4.21-r0 From eaef5ad4ca6bf8d0e5b60ceb4dc8d8295ca3f782 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 30 Jul 2021 20:54:23 +0200 Subject: [PATCH 085/452] Bot Updating Templated Files --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6fec88..902c3fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -402,7 +402,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } @@ -429,7 +429,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } @@ -456,7 +456,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" @@ -490,7 +490,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ + --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" From a8ee4efc95e3ce8df499bf4079894b3f432d4dd9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 30 Jul 2021 20:55:48 +0200 Subject: [PATCH 086/452] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 997006f..20fb4e6 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Find us at: [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbookstack%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bookstack/latest/index.html) -[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Feautring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. +[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. From 12d3cd6e9847bded2cd6a38f4771807017b97e54 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 30 Jul 2021 20:59:06 +0200 Subject: [PATCH 087/452] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 45f2128..92c1698 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,29 +131,29 @@ pcre-8.44-r0 pcre2-10.36-r0 php7-7.4.21-r0 php7-common-7.4.21-r0 -php7-ctype-7.4.21-r0 -php7-curl-7.4.21-r0 -php7-dom-7.4.21-r0 +php7-ctype-7.4.22-r0 +php7-curl-7.4.22-r0 +php7-dom-7.4.22-r0 php7-fileinfo-7.4.21-r0 php7-fpm-7.4.21-r0 -php7-gd-7.4.21-r0 -php7-iconv-7.4.21-r0 +php7-gd-7.4.22-r0 +php7-iconv-7.4.22-r0 php7-json-7.4.21-r0 -php7-ldap-7.4.21-r0 +php7-ldap-7.4.22-r0 php7-mbstring-7.4.21-r0 -php7-mysqlnd-7.4.21-r0 +php7-mysqlnd-7.4.22-r0 php7-openssl-7.4.21-r0 -php7-pdo-7.4.21-r0 -php7-pdo_mysql-7.4.21-r0 +php7-pdo-7.4.22-r0 +php7-pdo_mysql-7.4.22-r0 php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.21-r0 +php7-phar-7.4.22-r0 php7-session-7.4.21-r0 php7-simplexml-7.4.21-r0 -php7-tokenizer-7.4.21-r0 +php7-tokenizer-7.4.22-r0 php7-xml-7.4.21-r0 php7-xmlwriter-7.4.21-r0 -php7-zip-7.4.21-r0 +php7-zip-7.4.22-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 From 3e15b270410958226a9f12a947144d7beaf967c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 Aug 2021 18:02:21 +0200 Subject: [PATCH 088/452] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 92c1698..1ce68cd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 apache2-utils-2.4.48-r0 -apk-tools-2.12.5-r1 +apk-tools-2.12.6-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 argon2-libs-20190702-r1 @@ -129,30 +129,30 @@ p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 pcre2-10.36-r0 -php7-7.4.21-r0 -php7-common-7.4.21-r0 +php7-7.4.22-r0 +php7-common-7.4.22-r0 php7-ctype-7.4.22-r0 php7-curl-7.4.22-r0 php7-dom-7.4.22-r0 -php7-fileinfo-7.4.21-r0 -php7-fpm-7.4.21-r0 +php7-fileinfo-7.4.22-r0 +php7-fpm-7.4.22-r0 php7-gd-7.4.22-r0 php7-iconv-7.4.22-r0 -php7-json-7.4.21-r0 +php7-json-7.4.22-r0 php7-ldap-7.4.22-r0 -php7-mbstring-7.4.21-r0 +php7-mbstring-7.4.22-r0 php7-mysqlnd-7.4.22-r0 -php7-openssl-7.4.21-r0 +php7-openssl-7.4.22-r0 php7-pdo-7.4.22-r0 php7-pdo_mysql-7.4.22-r0 php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 php7-phar-7.4.22-r0 -php7-session-7.4.21-r0 -php7-simplexml-7.4.21-r0 +php7-session-7.4.22-r0 +php7-simplexml-7.4.22-r0 php7-tokenizer-7.4.22-r0 -php7-xml-7.4.21-r0 -php7-xmlwriter-7.4.21-r0 +php7-xml-7.4.22-r0 +php7-xmlwriter-7.4.22-r0 php7-zip-7.4.22-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 From 3aec0b9e4974eed807f2f363c250b8e62abadf01 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 12 Aug 2021 18:01:54 +0200 Subject: [PATCH 089/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1ce68cd..2b24023 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 apache2-utils-2.4.48-r0 -apk-tools-2.12.6-r0 +apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 argon2-libs-20190702-r1 @@ -71,7 +71,7 @@ libpng-1.6.37-r1 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.3-r0 libressl3.3-libssl-3.3.3-r0 -libretls-3.3.3-r2 +libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libsm-1.2.3-r0 From ed64d39079845178157db97c42e765e0ff1ad0b5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Aug 2021 17:59:37 +0200 Subject: [PATCH 090/452] Bot Updating Templated Files --- Jenkinsfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 902c3fe..cb9ecd9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -385,7 +385,9 @@ pipeline { // Build Docker container for push to LS Repo stage('Build-Single') { when { - environment name: 'MULTIARCH', value: 'false' + expression { + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + } environment name: 'EXIT_STATUS', value: '' } steps { @@ -410,7 +412,10 @@ pipeline { // Build MultiArch Docker containers for push to LS Repo stage('Build-Multi') { when { - environment name: 'MULTIARCH', value: 'true' + allOf { + environment name: 'MULTIARCH', value: 'true' + expression { params.PACKAGE_CHECK == 'false' } + } environment name: 'EXIT_STATUS', value: '' } parallel { @@ -515,7 +520,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} @@ -576,7 +581,7 @@ pipeline { steps { sh '''#! /bin/bash echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} @@ -600,7 +605,7 @@ pipeline { steps { sh '''#! /bin/bash echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then docker rmi ${IMAGE}:amd64-${META_TAG} else docker rmi ${IMAGE}:${META_TAG} From 19ecca019fe5075deffa44b45d085c058f8046e7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 Aug 2021 18:03:29 +0200 Subject: [PATCH 091/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2b24023..e632b32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cairo-1.16.0-r3 cdparanoia-libs-10.2-r9 -composer-2.1.3-r0 +composer-2.1.6-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 curl-7.78.0-r0 @@ -122,7 +122,7 @@ nettle-3.7.2-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.1-r3 oniguruma-6.9.7.1-r0 -openssl-1.1.1k-r0 +openssl-1.1.1l-r0 opus-1.3.1-r1 orc-0.4.32-r0 p11-kit-0.23.22-r0 From 1a5a35391fcc24325fae5bdcd171455d803fb08a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 31 Aug 2021 23:22:36 +0200 Subject: [PATCH 092/452] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e632b32..52cedb8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,29 +131,29 @@ pcre-8.44-r0 pcre2-10.36-r0 php7-7.4.22-r0 php7-common-7.4.22-r0 -php7-ctype-7.4.22-r0 -php7-curl-7.4.22-r0 -php7-dom-7.4.22-r0 +php7-ctype-7.4.23-r0 +php7-curl-7.4.23-r0 +php7-dom-7.4.23-r0 php7-fileinfo-7.4.22-r0 php7-fpm-7.4.22-r0 -php7-gd-7.4.22-r0 -php7-iconv-7.4.22-r0 +php7-gd-7.4.23-r0 +php7-iconv-7.4.23-r0 php7-json-7.4.22-r0 -php7-ldap-7.4.22-r0 +php7-ldap-7.4.23-r0 php7-mbstring-7.4.22-r0 -php7-mysqlnd-7.4.22-r0 +php7-mysqlnd-7.4.23-r0 php7-openssl-7.4.22-r0 -php7-pdo-7.4.22-r0 -php7-pdo_mysql-7.4.22-r0 +php7-pdo-7.4.23-r0 +php7-pdo_mysql-7.4.23-r0 php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.22-r0 +php7-phar-7.4.23-r0 php7-session-7.4.22-r0 php7-simplexml-7.4.22-r0 -php7-tokenizer-7.4.22-r0 +php7-tokenizer-7.4.23-r0 php7-xml-7.4.22-r0 php7-xmlwriter-7.4.22-r0 -php7-zip-7.4.22-r0 +php7-zip-7.4.23-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 From 8dba937f96feeeea58c6dcd8cb84c45bc1f60387 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 Sep 2021 18:00:11 +0200 Subject: [PATCH 093/452] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 52cedb8..447a582 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,7 +44,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 -libcrypto1.1-1.1.1k-r0 +libcrypto1.1-1.1.1l-r0 libcurl-7.78.0-r0 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 @@ -75,7 +75,7 @@ libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1k-r0 +libssl1.1-1.1.1l-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 @@ -129,30 +129,30 @@ p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 pcre2-10.36-r0 -php7-7.4.22-r0 -php7-common-7.4.22-r0 +php7-7.4.23-r0 +php7-common-7.4.23-r0 php7-ctype-7.4.23-r0 php7-curl-7.4.23-r0 php7-dom-7.4.23-r0 -php7-fileinfo-7.4.22-r0 -php7-fpm-7.4.22-r0 +php7-fileinfo-7.4.23-r0 +php7-fpm-7.4.23-r0 php7-gd-7.4.23-r0 php7-iconv-7.4.23-r0 -php7-json-7.4.22-r0 +php7-json-7.4.23-r0 php7-ldap-7.4.23-r0 -php7-mbstring-7.4.22-r0 +php7-mbstring-7.4.23-r0 php7-mysqlnd-7.4.23-r0 -php7-openssl-7.4.22-r0 +php7-openssl-7.4.23-r0 php7-pdo-7.4.23-r0 php7-pdo_mysql-7.4.23-r0 php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 php7-phar-7.4.23-r0 -php7-session-7.4.22-r0 -php7-simplexml-7.4.22-r0 +php7-session-7.4.23-r0 +php7-simplexml-7.4.23-r0 php7-tokenizer-7.4.23-r0 -php7-xml-7.4.22-r0 -php7-xmlwriter-7.4.22-r0 +php7-xml-7.4.23-r0 +php7-xmlwriter-7.4.23-r0 php7-zip-7.4.23-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 From 8361cd993e93473d110c9bd2d515f9bd35c0b117 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Sep 2021 18:00:19 +0200 Subject: [PATCH 094/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 447a582..e615655 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,7 +53,7 @@ libevent-2.1.12-r2 libffi-3.3-r2 libfontenc-1.1.4-r0 libgcc-10.3.1_git20210424-r2 -libgcrypt-1.9.3-r0 +libgcrypt-1.9.4-r0 libgpg-error-1.42-r0 libice-1.0.10-r0 libinput-libs-1.18.0-r0 From 63a61cf81806f5ea2236f6faaaa4e0baffb6a7a8 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Thu, 9 Sep 2021 17:47:38 -0400 Subject: [PATCH 095/452] overlay-fs bug workaround - move to tmp location then move and chown on init --- Dockerfile | 4 +++- Dockerfile.aarch64 | 4 +++- Dockerfile.armhf | 4 +++- root/etc/cont-init.d/50-config | 9 ++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33bc0d9..3f64736 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,8 @@ RUN \ /var/www/html/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /var/www/html/ && \ + echo "**** overlay-fs bug workaround ****" && \ + mv /var/www /var/www-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /root/.composer \ @@ -61,4 +63,4 @@ RUN \ COPY root/ / VOLUME /config -EXPOSE 80 \ No newline at end of file +EXPOSE 80 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 201c014..3ae42f0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -53,6 +53,8 @@ RUN \ /var/www/html/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /var/www/html/ && \ + echo "**** overlay-fs bug workaround ****" && \ + mv /var/www /var/www-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /root/.composer \ @@ -61,4 +63,4 @@ RUN \ COPY root/ / VOLUME /config -EXPOSE 80 \ No newline at end of file +EXPOSE 80 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d42b146..a380eaa 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -53,6 +53,8 @@ RUN \ /var/www/html/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /var/www/html/ && \ + echo "**** overlay-fs bug workaround ****" && \ + mv /var/www /var/www-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /root/.composer \ @@ -61,4 +63,4 @@ RUN \ COPY root/ / VOLUME /config -EXPOSE 80 \ No newline at end of file +EXPOSE 80 diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 2c0558a..92b951d 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -1,5 +1,11 @@ #!/usr/bin/with-contenv bash +if [ -d /var/www-tmp ]; then + echo "New container detected. Setting up app folder and fixing permissions." + mv /var/www-tmp /var/www + chown -R abc:abc /var/www +fi + # create directory structure mkdir -p \ /config/www/{uploads,files,images} @@ -108,8 +114,5 @@ fi chown -R abc:abc \ /config -find /var/www -print0 | xargs -P "$(nproc)" -I {} -0 chown -h abc:abc {} -find /var/www -print0 -type d | xargs -P "$(nproc)" -I {} -0 chown -h abc:abc {} - # set lockfile to avoid DB waits for this specific container touch /dbwait.lock From fe1b895d7dc6476a5c22c7256bc34b48ca778746 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Sep 2021 18:00:14 +0200 Subject: [PATCH 096/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e615655..4398ed4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ cdparanoia-libs-10.2-r9 composer-2.1.6-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 -curl-7.78.0-r0 +curl-7.79.0-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 @@ -45,7 +45,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 libcrypto1.1-1.1.1l-r0 -libcurl-7.78.0-r0 +libcurl-7.79.0-r0 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 libevdev-1.11.0-r1 @@ -118,7 +118,7 @@ nano-5.7-r2 ncurses-libs-6.2_p20210612-r0 ncurses-terminfo-base-6.2_p20210612-r0 netcat-openbsd-1.130-r2 -nettle-3.7.2-r0 +nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.1-r3 oniguruma-6.9.7.1-r0 From 05f0a7f5c7b29ae970cda8c3bc1945fb31f20937 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Sep 2021 18:00:08 +0200 Subject: [PATCH 097/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4398ed4..3303039 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 -apache2-utils-2.4.48-r0 +apache2-utils-2.4.49-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 @@ -17,7 +17,7 @@ cdparanoia-libs-10.2-r9 composer-2.1.6-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 -curl-7.79.0-r0 +curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 @@ -45,7 +45,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 libcrypto1.1-1.1.1l-r0 -libcurl-7.79.0-r0 +libcurl-7.79.1-r0 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 libevdev-1.11.0-r1 From 9dc6398cf8576ed8b169e1124a714ce296c54798 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Sep 2021 18:00:00 +0200 Subject: [PATCH 098/452] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3303039..63f322d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,31 +129,31 @@ p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 pcre2-10.36-r0 -php7-7.4.23-r0 -php7-common-7.4.23-r0 -php7-ctype-7.4.23-r0 -php7-curl-7.4.23-r0 -php7-dom-7.4.23-r0 -php7-fileinfo-7.4.23-r0 -php7-fpm-7.4.23-r0 -php7-gd-7.4.23-r0 -php7-iconv-7.4.23-r0 -php7-json-7.4.23-r0 -php7-ldap-7.4.23-r0 -php7-mbstring-7.4.23-r0 -php7-mysqlnd-7.4.23-r0 -php7-openssl-7.4.23-r0 -php7-pdo-7.4.23-r0 -php7-pdo_mysql-7.4.23-r0 +php7-7.4.24-r0 +php7-common-7.4.24-r0 +php7-ctype-7.4.24-r0 +php7-curl-7.4.24-r0 +php7-dom-7.4.24-r0 +php7-fileinfo-7.4.24-r0 +php7-fpm-7.4.24-r0 +php7-gd-7.4.24-r0 +php7-iconv-7.4.24-r0 +php7-json-7.4.24-r0 +php7-ldap-7.4.24-r0 +php7-mbstring-7.4.24-r0 +php7-mysqlnd-7.4.24-r0 +php7-openssl-7.4.24-r0 +php7-pdo-7.4.24-r0 +php7-pdo_mysql-7.4.24-r0 php7-pecl-igbinary-3.2.4-r0 php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.23-r0 -php7-session-7.4.23-r0 -php7-simplexml-7.4.23-r0 -php7-tokenizer-7.4.23-r0 -php7-xml-7.4.23-r0 -php7-xmlwriter-7.4.23-r0 -php7-zip-7.4.23-r0 +php7-phar-7.4.24-r0 +php7-session-7.4.24-r0 +php7-simplexml-7.4.24-r0 +php7-tokenizer-7.4.24-r0 +php7-xml-7.4.24-r0 +php7-xmlwriter-7.4.24-r0 +php7-zip-7.4.24-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 @@ -176,7 +176,7 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r3 tar-1.34-r0 ttf-freefont-20120503-r1 -tzdata-2021a-r0 +tzdata-2021b-r0 utmps-0.1.0.2-r0 wayland-libs-client-1.19.0-r0 wayland-libs-cursor-1.19.0-r0 From 680ec4752f2baf40c3d5d31a9c9109620f4d0e4e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 Oct 2021 18:37:37 +0200 Subject: [PATCH 099/452] Bot Updating Templated Files --- Jenkinsfile | 108 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 101 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb9ecd9..720e676 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'master' EXT_USER = 'bookstackapp' EXT_REPO = 'bookstack' @@ -126,6 +127,23 @@ pipeline { env.EXT_RELEASE_CLEAN = sh( script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() + + env.SEMVER = (new Date()).format('YYYY.MM.dd') + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + if (semver.find()) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else { + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + if (semver.find()) { + if (semver[0][3]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" + } else if (!semver[0][3] && !semver[0][4]) { + env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" + } + } + } + + println("SEMVER: ${env.SEMVER}") } } } @@ -140,6 +158,7 @@ pipeline { env.IMAGE = env.DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { @@ -162,6 +181,7 @@ pipeline { env.IMAGE = env.DEV_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { @@ -184,6 +204,7 @@ pipeline { env.IMAGE = env.PR_DOCKERHUB_IMAGE env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME + env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST } else { @@ -379,6 +400,48 @@ pipeline { "visibility":"public"}' ''' } } + /* ####################### + Scarf.sh package registry + ####################### */ + // Add package to Scarf.sh and set permissions + stage("Scarf.sh package registry"){ + when { + branch "master" + environment name: 'EXIT_STATUS', value: '' + } + steps{ + sh '''#! /bin/bash + set -e + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid') + if [ -z "${PACKAGE_UUID}" ]; then + echo "Adding package to Scarf.sh" + PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{"name":"linuxserver/bookstack",\ + "shortDescription":"example description",\ + "libraryType":"docker",\ + "website":"https://github.com/linuxserver/docker-bookstack",\ + "backendUrl":"https://ghcr.io/linuxserver/bookstack",\ + "publicUrl":"https://lscr.io/linuxserver/bookstack"}' \ + | jq -r .uuid) + else + echo "Package already exists on Scarf.sh" + fi + echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" + curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ + -H "Authorization: Bearer ${SCARF_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ + {"userQuery":"roxedus","permissionLevel":"admin"},\ + {"userQuery":"nemchik","permissionLevel":"admin"},\ + {"userQuery":"driz","permissionLevel":"admin"},\ + {"userQuery":"aptalca","permissionLevel":"admin"},\ + {"userQuery":"saarg","permissionLevel":"admin"},\ + {"userQuery":"Stark","permissionLevel":"admin"}]' + ''' + } + } /* ############### Build Container ############### */ @@ -386,7 +449,7 @@ pipeline { stage('Build-Single') { when { expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' + env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' } environment name: 'EXIT_STATUS', value: '' } @@ -680,6 +743,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -688,22 +757,26 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} + docker push ${PUSHIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : + ${DELETEIMAGE}:latest \ + ${DELETEIMAGE}:${SEMVER} || : done ''' } @@ -722,6 +795,12 @@ pipeline { credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', usernameVariable: 'DOCKERUSER', passwordVariable: 'DOCKERPASS' + ], + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' ] ]) { retry(5) { @@ -730,13 +809,14 @@ pipeline { echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -746,6 +826,9 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -755,6 +838,9 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -767,24 +853,32 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} done ''' } sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do + for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 0d863316e04c134538278e9d59a04089e1ca65c1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 4 Oct 2021 18:38:42 +0200 Subject: [PATCH 100/452] Bot Updating Templated Files --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 20fb4e6..7219690 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Find us at: [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-bookstack/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/bookstack) [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) @@ -50,7 +51,7 @@ For more information on BookStack visit their website and check it out: https:// Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `ghcr.io/linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -141,7 +142,7 @@ docker run -d \ -p 6875:80 \ -v /path/to/data:/config \ --restart unless-stopped \ - ghcr.io/linuxserver/bookstack + lscr.io/linuxserver/bookstack ``` ## Parameters @@ -203,7 +204,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/bookstack` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bookstack` ## Updating Info @@ -221,7 +222,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull ghcr.io/linuxserver/bookstack` +* Update the image: `docker pull lscr.io/linuxserver/bookstack` * Stop the running container: `docker stop bookstack` * Delete the container: `docker rm bookstack` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -256,7 +257,7 @@ cd docker-bookstack docker build \ --no-cache \ --pull \ - -t ghcr.io/linuxserver/bookstack:latest . + -t lscr.io/linuxserver/bookstack:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` From 5524fa4ad64cf1acecf613c9542ede6c57626f83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Oct 2021 18:01:02 +0200 Subject: [PATCH 101/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 63f322d..efc8f99 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 -apache2-utils-2.4.49-r0 +apache2-utils-2.4.50-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 @@ -14,7 +14,7 @@ ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cairo-1.16.0-r3 cdparanoia-libs-10.2-r9 -composer-2.1.6-r0 +composer-2.1.9-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 curl-7.79.1-r0 @@ -176,7 +176,7 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r3 tar-1.34-r0 ttf-freefont-20120503-r1 -tzdata-2021b-r0 +tzdata-2021c-r0 utmps-0.1.0.2-r0 wayland-libs-client-1.19.0-r0 wayland-libs-cursor-1.19.0-r0 From 38b554695070a907fd97119cd7ee7598becc4836 Mon Sep 17 00:00:00 2001 From: Robert Meredith <8134995+rjmidau@users.noreply.github.com> Date: Sat, 9 Oct 2021 17:21:35 +1100 Subject: [PATCH 102/452] Create themes folder in config folder and symlink to it --- root/etc/cont-init.d/50-config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 92b951d..48671e5 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -8,7 +8,7 @@ fi # create directory structure mkdir -p \ - /config/www/{uploads,files,images} + /config/www/{uploads,files,images,themes} # check for .env and copy default if needed [[ ! -f "/config/www/.env" ]] && \ @@ -20,6 +20,7 @@ mkdir -p \ # create symlinks symlinks=( \ +/var/www/html/themes \ /var/www/html/storage/uploads/files \ /var/www/html/storage/uploads/images \ /var/www/html/public/uploads \ From f7c9f14d0d404fd2c769709908a2acaab13f4c1f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Oct 2021 18:00:25 +0200 Subject: [PATCH 103/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index efc8f99..3e12c53 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.3-r1 alsa-lib-1.2.5-r2 -apache2-utils-2.4.50-r0 +apache2-utils-2.4.51-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 @@ -145,7 +145,7 @@ php7-mysqlnd-7.4.24-r0 php7-openssl-7.4.24-r0 php7-pdo-7.4.24-r0 php7-pdo_mysql-7.4.24-r0 -php7-pecl-igbinary-3.2.4-r0 +php7-pecl-igbinary-3.2.6-r0 php7-pecl-memcached-3.1.5-r2 php7-phar-7.4.24-r0 php7-session-7.4.24-r0 From c4cce376525e931dcd26d9a67ff88085e53fad00 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 15 Oct 2021 21:42:35 +0100 Subject: [PATCH 104/452] Add lscr to custom sample comopse --- readme-vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 47ba42a..04d9b33 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,7 +43,7 @@ custom_compose: | version: "2" services: bookstack: - image: ghcr.io/linuxserver/bookstack + image: lscr.io/linuxserver/bookstack container_name: bookstack environment: - PUID=1000 @@ -61,7 +61,7 @@ custom_compose: | depends_on: - bookstack_db bookstack_db: - image: ghcr.io/linuxserver/mariadb + image: lscr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 From 753de3e0f97ea996ba3dc682cbe812efbf7a0a74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 17 Oct 2021 19:32:31 +0200 Subject: [PATCH 105/452] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7219690..7332d42 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ Here are some example snippets to help you get started creating a container. version: "2" services: bookstack: - image: ghcr.io/linuxserver/bookstack + image: lscr.io/linuxserver/bookstack container_name: bookstack environment: - PUID=1000 @@ -111,7 +111,7 @@ services: depends_on: - bookstack_db bookstack_db: - image: ghcr.io/linuxserver/mariadb + image: lscr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 From 367cb91e7fa2c3ea58b64ed0f03b484c4e957e95 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Oct 2021 18:16:09 +0200 Subject: [PATCH 106/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3e12c53..6ddf61f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,5 @@ alpine-baselayout-3.2.0-r16 -alpine-keys-2.3-r1 +alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 apache2-utils-2.4.51-r0 apk-tools-2.12.7-r0 @@ -176,7 +176,7 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r3 tar-1.34-r0 ttf-freefont-20120503-r1 -tzdata-2021c-r0 +tzdata-2021d-r0 utmps-0.1.0.2-r0 wayland-libs-client-1.19.0-r0 wayland-libs-cursor-1.19.0-r0 From 579328317e0f892496af9f9085a09fce66453c65 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 25 Oct 2021 17:24:55 +0200 Subject: [PATCH 107/452] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6ddf61f..546b598 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,31 +129,31 @@ p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 pcre2-10.36-r0 -php7-7.4.24-r0 -php7-common-7.4.24-r0 -php7-ctype-7.4.24-r0 -php7-curl-7.4.24-r0 -php7-dom-7.4.24-r0 -php7-fileinfo-7.4.24-r0 -php7-fpm-7.4.24-r0 -php7-gd-7.4.24-r0 -php7-iconv-7.4.24-r0 -php7-json-7.4.24-r0 -php7-ldap-7.4.24-r0 -php7-mbstring-7.4.24-r0 -php7-mysqlnd-7.4.24-r0 -php7-openssl-7.4.24-r0 -php7-pdo-7.4.24-r0 -php7-pdo_mysql-7.4.24-r0 +php7-7.4.25-r0 +php7-common-7.4.25-r0 +php7-ctype-7.4.25-r0 +php7-curl-7.4.25-r0 +php7-dom-7.4.25-r0 +php7-fileinfo-7.4.25-r0 +php7-fpm-7.4.25-r0 +php7-gd-7.4.25-r0 +php7-iconv-7.4.25-r0 +php7-json-7.4.25-r0 +php7-ldap-7.4.25-r0 +php7-mbstring-7.4.25-r0 +php7-mysqlnd-7.4.25-r0 +php7-openssl-7.4.25-r0 +php7-pdo-7.4.25-r0 +php7-pdo_mysql-7.4.25-r0 php7-pecl-igbinary-3.2.6-r0 php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.24-r0 -php7-session-7.4.24-r0 -php7-simplexml-7.4.24-r0 -php7-tokenizer-7.4.24-r0 -php7-xml-7.4.24-r0 -php7-xmlwriter-7.4.24-r0 -php7-zip-7.4.24-r0 +php7-phar-7.4.25-r0 +php7-session-7.4.25-r0 +php7-simplexml-7.4.25-r0 +php7-tokenizer-7.4.25-r0 +php7-xml-7.4.25-r0 +php7-xmlwriter-7.4.25-r0 +php7-zip-7.4.25-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 From 08320221beb80439486098c2c23a4063b42d34a2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Oct 2021 17:28:35 +0200 Subject: [PATCH 108/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 546b598..302369e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -176,7 +176,7 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r3 tar-1.34-r0 ttf-freefont-20120503-r1 -tzdata-2021d-r0 +tzdata-2021e-r0 utmps-0.1.0.2-r0 wayland-libs-client-1.19.0-r0 wayland-libs-cursor-1.19.0-r0 From 4a067d6fe29cd640565c8677b0cbf6d5009b149b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Nov 2021 17:00:33 +0100 Subject: [PATCH 109/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 302369e..bbb8b16 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ hyphen-2.8.8-r1 icu-libs-67.1-r2 libacl-2.2.53-r0 libattr-2.5.1-r0 -libblkid-2.37-r0 +libblkid-2.37.2-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -63,7 +63,7 @@ libldap-2.4.58-r0 libmagic-5.40-r1 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 -libmount-2.37-r0 +libmount-2.37.2-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpcre2-16-10.36-r0 @@ -80,7 +80,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37-r0 +libuuid-2.37.2-r0 libvorbis-1.3.7-r0 libwebp-1.2.0-r2 libx11-1.7.2-r0 From ff9f35c37d49a8a52002b45d6412eb6d0f932a4b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Nov 2021 17:00:26 +0100 Subject: [PATCH 110/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bbb8b16..fecc556 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ argon2-libs-20190702-r1 avahi-libs-0.8-r5 bash-5.1.4-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r3 +busybox-1.33.1-r6 ca-certificates-20191127-r5 ca-certificates-bundle-20191127-r5 cairo-1.16.0-r3 @@ -120,7 +120,7 @@ ncurses-terminfo-base-6.2_p20210612-r0 netcat-openbsd-1.130-r2 nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 -nginx-1.20.1-r3 +nginx-1.20.2-r0 oniguruma-6.9.7.1-r0 openssl-1.1.1l-r0 opus-1.3.1-r1 @@ -173,7 +173,7 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r3 +ssl_client-1.33.1-r6 tar-1.34-r0 ttf-freefont-20120503-r1 tzdata-2021e-r0 From 4a1f9831152a9aa1ed5e9b01c3cd668168485162 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Nov 2021 22:24:31 +0100 Subject: [PATCH 111/452] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fecc556..53d8e07 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -131,29 +131,29 @@ pcre-8.44-r0 pcre2-10.36-r0 php7-7.4.25-r0 php7-common-7.4.25-r0 -php7-ctype-7.4.25-r0 -php7-curl-7.4.25-r0 -php7-dom-7.4.25-r0 +php7-ctype-7.4.26-r0 +php7-curl-7.4.26-r0 +php7-dom-7.4.26-r0 php7-fileinfo-7.4.25-r0 php7-fpm-7.4.25-r0 -php7-gd-7.4.25-r0 -php7-iconv-7.4.25-r0 +php7-gd-7.4.26-r0 +php7-iconv-7.4.26-r0 php7-json-7.4.25-r0 -php7-ldap-7.4.25-r0 +php7-ldap-7.4.26-r0 php7-mbstring-7.4.25-r0 -php7-mysqlnd-7.4.25-r0 +php7-mysqlnd-7.4.26-r0 php7-openssl-7.4.25-r0 -php7-pdo-7.4.25-r0 -php7-pdo_mysql-7.4.25-r0 +php7-pdo-7.4.26-r0 +php7-pdo_mysql-7.4.26-r0 php7-pecl-igbinary-3.2.6-r0 php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.25-r0 +php7-phar-7.4.26-r0 php7-session-7.4.25-r0 php7-simplexml-7.4.25-r0 -php7-tokenizer-7.4.25-r0 +php7-tokenizer-7.4.26-r0 php7-xml-7.4.25-r0 php7-xmlwriter-7.4.25-r0 -php7-zip-7.4.25-r0 +php7-zip-7.4.26-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 popt-1.18-r0 From f95a455dfef183c505c1acf402f7706976059306 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Nov 2021 17:00:11 +0100 Subject: [PATCH 112/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 53d8e07..3c25173 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,30 +129,30 @@ p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 pcre2-10.36-r0 -php7-7.4.25-r0 -php7-common-7.4.25-r0 +php7-7.4.26-r0 +php7-common-7.4.26-r0 php7-ctype-7.4.26-r0 php7-curl-7.4.26-r0 php7-dom-7.4.26-r0 -php7-fileinfo-7.4.25-r0 -php7-fpm-7.4.25-r0 +php7-fileinfo-7.4.26-r0 +php7-fpm-7.4.26-r0 php7-gd-7.4.26-r0 php7-iconv-7.4.26-r0 -php7-json-7.4.25-r0 +php7-json-7.4.26-r0 php7-ldap-7.4.26-r0 -php7-mbstring-7.4.25-r0 +php7-mbstring-7.4.26-r0 php7-mysqlnd-7.4.26-r0 -php7-openssl-7.4.25-r0 +php7-openssl-7.4.26-r0 php7-pdo-7.4.26-r0 php7-pdo_mysql-7.4.26-r0 php7-pecl-igbinary-3.2.6-r0 php7-pecl-memcached-3.1.5-r2 php7-phar-7.4.26-r0 -php7-session-7.4.25-r0 -php7-simplexml-7.4.25-r0 +php7-session-7.4.26-r0 +php7-simplexml-7.4.26-r0 php7-tokenizer-7.4.26-r0 -php7-xml-7.4.25-r0 -php7-xmlwriter-7.4.25-r0 +php7-xml-7.4.26-r0 +php7-xmlwriter-7.4.26-r0 php7-zip-7.4.26-r0 pixman-0.40.0-r2 pkgconf-1.7.4-r0 From 1c2a823a5e0a86652075c5a0df002e07e0d882ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Dec 2021 18:31:46 +0100 Subject: [PATCH 113/452] Bot Updating Templated Files --- Jenkinsfile | 88 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 38 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 720e676..8d786d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,12 +128,11 @@ pipeline { script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', returnStdout: true).trim() - env.SEMVER = (new Date()).format('YYYY.MM.dd') - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)$/ + def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ if (semver.find()) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)$/ + semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ if (semver.find()) { if (semver[0][3]) { env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" @@ -143,7 +142,15 @@ pipeline { } } - println("SEMVER: ${env.SEMVER}") + if (env.SEMVER != null) { + if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" + } + println("SEMVER: ${env.SEMVER}") + } else { + println("No SEMVER detected") + } + } } } @@ -412,10 +419,10 @@ pipeline { steps{ sh '''#! /bin/bash set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid') if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" - PACKAGE_UUID=$(curl -sX POST https://scarf.sh/api/v1/packages \ + curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ -H "Authorization: Bearer ${SCARF_TOKEN}" \ -H "Content-Type: application/json" \ -d '{"name":"linuxserver/bookstack",\ @@ -423,22 +430,10 @@ pipeline { "libraryType":"docker",\ "website":"https://github.com/linuxserver/docker-bookstack",\ "backendUrl":"https://ghcr.io/linuxserver/bookstack",\ - "publicUrl":"https://lscr.io/linuxserver/bookstack"}' \ - | jq -r .uuid) + "publicUrl":"https://lscr.io/linuxserver/bookstack"}' || : else echo "Package already exists on Scarf.sh" fi - echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}" - curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '[{"userQuery":"Spad","permissionLevel":"admin"},\ - {"userQuery":"roxedus","permissionLevel":"admin"},\ - {"userQuery":"nemchik","permissionLevel":"admin"},\ - {"userQuery":"driz","permissionLevel":"admin"},\ - {"userQuery":"aptalca","permissionLevel":"admin"},\ - {"userQuery":"saarg","permissionLevel":"admin"},\ - {"userQuery":"Stark","permissionLevel":"admin"}]' ''' } } @@ -762,11 +757,15 @@ pipeline { docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} + fi docker push ${PUSHIMAGE}:latest docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - docker push ${PUSHIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${PUSHIMAGE}:${SEMVER} + fi done ''' } @@ -775,8 +774,10 @@ pipeline { docker rmi \ ${DELETEIMAGE}:${META_TAG} \ ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest \ - ${DELETEIMAGE}:${SEMVER} || : + ${DELETEIMAGE}:latest || : + if [ -n "${SEMVER}" ]; then + docker rmi ${DELETEIMAGE}:${SEMVER} || : + fi done ''' } @@ -826,9 +827,11 @@ pipeline { docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} @@ -838,9 +841,11 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + if [ -n "${SEMVER}" ]; then + docker push ${MANIFESTIMAGE}:amd64-${SEMVER} + docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} + docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm @@ -853,14 +858,18 @@ pipeline { docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + if [ -n "${SEMVER}" ]; then + docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + fi done ''' } @@ -870,15 +879,18 @@ pipeline { ${DELETEIMAGE}:amd64-${META_TAG} \ ${DELETEIMAGE}:amd64-latest \ ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:amd64-${SEMVER} \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ ${DELETEIMAGE}:arm32v7-latest \ ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : + ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : + if [ -n "${SEMVER}" ]; then + docker rmi \ + ${DELETEIMAGE}:amd64-${SEMVER} \ + ${DELETEIMAGE}:arm32v7-${SEMVER} \ + ${DELETEIMAGE}:arm64v8-${SEMVER} || : + fi done docker rmi \ ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ From 8fa0d63b2461c424201d97f1475a8aa56db27642 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Dec 2021 18:33:14 +0100 Subject: [PATCH 114/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7332d42..3559fac 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Find us at: # [linuxserver/bookstack](https://github.com/linuxserver/docker-bookstack) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbookstack?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fbookstack) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) From dce5e3c92390ec99624a744fbe8c83cfff395461 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Dec 2021 17:00:09 +0100 Subject: [PATCH 115/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3c25173..acbc26d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 -apache2-utils-2.4.51-r0 +apache2-utils-2.4.52-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 From a3116b03c220fafd75b7880f2f3894eee8e86d03 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Jan 2022 17:00:31 +0100 Subject: [PATCH 116/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index acbc26d..d7c6994 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 -expat-2.4.1-r0 +expat-2.4.3-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 From 7151ea84a0d2fbc718cdd69f99068cec897f5fba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Jan 2022 17:00:30 +0100 Subject: [PATCH 117/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d7c6994..527a186 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ avahi-libs-0.8-r5 bash-5.1.4-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r6 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 +ca-certificates-20211220-r0 +ca-certificates-bundle-20211220-r0 cairo-1.16.0-r3 cdparanoia-libs-10.2-r9 composer-2.1.9-r0 From a59932fda8e13938ed0da6d50d9f7c031e1fbf18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Feb 2022 17:00:40 +0100 Subject: [PATCH 118/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 527a186..20e0cf2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r0 +logrotate-3.18.1-r1 memcached-1.6.9-r0 mesa-21.1.2-r0 mesa-egl-21.1.2-r0 From 0e953b9de6b69b3167c27e8c15dfdfd085caeb10 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 6 Feb 2022 17:35:57 +0100 Subject: [PATCH 119/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 20e0cf2..3314aa6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ hyphen-2.8.8-r1 icu-libs-67.1-r2 libacl-2.2.53-r0 libattr-2.5.1-r0 -libblkid-2.37.2-r0 +libblkid-2.37.3-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -63,7 +63,7 @@ libldap-2.4.58-r0 libmagic-5.40-r1 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 -libmount-2.37.2-r0 +libmount-2.37.3-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpcre2-16-10.36-r0 From 213b9e38b348bc06d9d731a132e57b5082a027ec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Feb 2022 17:00:55 +0100 Subject: [PATCH 120/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3314aa6..aad87aa 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 -expat-2.4.3-r0 +expat-2.4.4-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 @@ -80,7 +80,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37.2-r0 +libuuid-2.37.3-r0 libvorbis-1.3.7-r0 libwebp-1.2.0-r2 libx11-1.7.2-r0 From c46e084218cd0fecbf2f4f32a696fa5c46bb6001 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Feb 2022 17:00:31 +0100 Subject: [PATCH 121/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index aad87aa..835b012 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -39,7 +39,7 @@ hyphen-2.8.8-r1 icu-libs-67.1-r2 libacl-2.2.53-r0 libattr-2.5.1-r0 -libblkid-2.37.3-r0 +libblkid-2.37.4-r0 libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 @@ -63,7 +63,7 @@ libldap-2.4.58-r0 libmagic-5.40-r1 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 -libmount-2.37.3-r0 +libmount-2.37.4-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 libpcre2-16-10.36-r0 @@ -80,7 +80,7 @@ libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 libunistring-0.9.10-r1 -libuuid-2.37.3-r0 +libuuid-2.37.4-r0 libvorbis-1.3.7-r0 libwebp-1.2.0-r2 libx11-1.7.2-r0 From 0284885dba634dc7a295a765ed556830ac7ede89 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Feb 2022 17:00:14 +0100 Subject: [PATCH 122/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 835b012..b39e9ef 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 -expat-2.4.4-r0 +expat-2.4.5-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 From 3c00492f9c391fa997b48700c0ee2552f0259fde Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Mar 2022 17:24:52 +0100 Subject: [PATCH 123/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b39e9ef..a477630 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,7 +21,7 @@ curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 -expat-2.4.5-r0 +expat-2.4.6-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 From f1b66f3d9713833524ffaf918d74442d8acb9594 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Mar 2022 17:49:36 +0100 Subject: [PATCH 124/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a477630..bd471ca 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,14 +21,14 @@ curl-7.79.1-r0 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 -expat-2.4.6-r0 +expat-2.4.7-r0 fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 git-2.32.0-r0 glib-2.68.3-r0 -gmp-6.2.1-r0 +gmp-6.2.1-r1 gnutls-3.7.1-r0 graphite2-1.3.14-r0 gst-plugins-base-1.18.4-r0 From cd48677611a135ae2119af296875ed38deb639f8 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 14 Mar 2022 20:16:27 +0000 Subject: [PATCH 125/452] Add changelog note for #111 --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 04d9b33..020d000 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "14.03.22:", desc: "Add symlinks for theme support." } - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." } - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." } From 1c319760d4a6069e170ee35723274db9e7e80605 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 14 Mar 2022 21:37:57 +0100 Subject: [PATCH 126/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3559fac..030c80c 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.03.22:** - Add symlinks for theme support. * **11.07.21:** - Rebase to Alpine 3.14. * **12.01.21:** - Remove unused requirement, as of release 0.31.0. * **17.12.20:** - Make APP_URL var required (upstream changes). From aa29174802bacd2e02bdfe35a5213963e9e706e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 17 Mar 2022 11:03:36 -0500 Subject: [PATCH 127/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index bd471ca..076f9e5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 -apache2-utils-2.4.52-r0 +apache2-utils-2.4.53-r0 apk-tools-2.12.7-r0 apr-1.7.0-r0 apr-util-1.6.1-r7 @@ -69,8 +69,8 @@ libpciaccess-0.16-r0 libpcre2-16-10.36-r0 libpng-1.6.37-r1 libproc-3.3.17-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 +libressl3.3-libcrypto-3.3.6-r0 +libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r2 libsasl-2.1.27-r12 libseccomp-2.5.1-r2 @@ -93,11 +93,11 @@ libxfixes-6.0.0-r0 libxft-2.3.3-r0 libxkbcommon-1.2.1-r0 libxkbcommon-x11-1.2.1-r0 -libxml2-2.9.12-r1 +libxml2-2.9.13-r0 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r1 -libxslt-1.1.34-r1 +libxslt-1.1.35-r0 libxt-1.2.1-r0 libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 @@ -122,7 +122,7 @@ nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r0 oniguruma-6.9.7.1-r0 -openssl-1.1.1l-r0 +openssl-1.1.1n-r0 opus-1.3.1-r1 orc-0.4.32-r0 p11-kit-0.23.22-r0 From cf331310ea03a1e1bb60b278614a053ef875fd71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 24 Mar 2022 17:30:11 +0100 Subject: [PATCH 128/452] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 076f9e5..3cc1501 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ apr-1.7.0-r0 apr-util-1.6.1-r7 argon2-libs-20190702-r1 avahi-libs-0.8-r5 -bash-5.1.4-r0 +bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r6 ca-certificates-20211220-r0 @@ -44,7 +44,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 -libcrypto1.1-1.1.1l-r0 +libcrypto1.1-1.1.1n-r0 libcurl-7.79.1-r0 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 @@ -72,10 +72,10 @@ libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 libretls-3.3.3p1-r2 -libsasl-2.1.27-r12 +libsasl-2.1.28-r0 libseccomp-2.5.1-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1l-r0 +libssl1.1-1.1.1n-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 @@ -176,7 +176,7 @@ sqlite-libs-3.35.5-r0 ssl_client-1.33.1-r6 tar-1.34-r0 ttf-freefont-20120503-r1 -tzdata-2021e-r0 +tzdata-2022a-r0 utmps-0.1.0.2-r0 wayland-libs-client-1.19.0-r0 wayland-libs-cursor-1.19.0-r0 From 08e142650f1c9d182d853a6fc77c271b010bdc79 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 31 Mar 2022 18:00:36 +0200 Subject: [PATCH 129/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3cc1501..2cbfacc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -71,7 +71,7 @@ libpng-1.6.37-r1 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 libressl3.3-libssl-3.3.6-r0 -libretls-3.3.3p1-r2 +libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libseccomp-2.5.1-r2 libsm-1.2.3-r0 @@ -191,5 +191,5 @@ xcb-util-wm-0.4.1-r1 xkeyboard-config-2.33-r0 xz-5.2.5-r0 xz-libs-5.2.5-r0 -zlib-1.2.11-r3 +zlib-1.2.12-r0 zstd-libs-1.4.9-r1 From cf468f5ac0f3836467e2f6e30977040ba7d2541b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Apr 2022 11:01:18 -0500 Subject: [PATCH 130/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2cbfacc..5f6f69d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ argon2-libs-20190702-r1 avahi-libs-0.8-r5 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r6 +busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 cairo-1.16.0-r3 @@ -173,7 +173,7 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r6 +ssl_client-1.33.1-r7 tar-1.34-r0 ttf-freefont-20120503-r1 tzdata-2022a-r0 From a13c1a6a25536f1b74f188a05b6732cd1ea12694 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Apr 2022 11:03:45 -0500 Subject: [PATCH 131/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5f6f69d..8e85faf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ fontconfig-2.13.1-r4 freetype-2.10.4-r1 fribidi-1.0.10-r0 gdbm-1.19-r0 -git-2.32.0-r0 +git-2.32.1-r0 glib-2.68.3-r0 gmp-6.2.1-r1 gnutls-3.7.1-r0 @@ -189,7 +189,7 @@ xcb-util-keysyms-0.4.0-r1 xcb-util-renderutil-0.3.9-r1 xcb-util-wm-0.4.1-r1 xkeyboard-config-2.33-r0 -xz-5.2.5-r0 -xz-libs-5.2.5-r0 +xz-5.2.5-r1 +xz-libs-5.2.5-r1 zlib-1.2.12-r0 zstd-libs-1.4.9-r1 From 6249989ed9c80337fbf2fa8ae72f339d234f7e66 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Apr 2022 18:00:39 +0200 Subject: [PATCH 132/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8e85faf..3e49018 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ cdparanoia-libs-10.2-r9 composer-2.1.9-r0 coreutils-8.32-r2 cups-libs-2.3.3-r2 -curl-7.79.1-r0 +curl-7.79.1-r1 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 @@ -45,7 +45,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 libcrypto1.1-1.1.1n-r0 -libcurl-7.79.1-r0 +libcurl-7.79.1-r1 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 libevdev-1.11.0-r1 From 0adab4d87264d9626fdd74c5581cb67fce684645 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 4 May 2022 16:25:46 -0500 Subject: [PATCH 133/452] Bot Updating Templated Files --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d786d9..85922db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,9 +353,11 @@ pipeline { if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From 4c2f3aa850882da5214f7a3a250f5aed922fd00a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 4 May 2022 23:27:08 +0200 Subject: [PATCH 134/452] Bot Updating Templated Files --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 030c80c..055ec00 100644 --- a/README.md +++ b/README.md @@ -50,17 +50,17 @@ For more information on BookStack visit their website and check it out: https:// ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/bookstack` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/bookstack:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Application Setup @@ -143,7 +143,7 @@ docker run -d \ -p 6875:80 \ -v /path/to/data:/config \ --restart unless-stopped \ - lscr.io/linuxserver/bookstack + lscr.io/linuxserver/bookstack:latest ``` ## Parameters @@ -205,7 +205,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bookstack` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bookstack:latest` ## Updating Info @@ -223,7 +223,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/bookstack` +* Update the image: `docker pull lscr.io/linuxserver/bookstack:latest` * Stop the running container: `docker stop bookstack` * Delete the container: `docker rm bookstack` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) From 6d78458e97effc9b97a73f5390e4be15abc0dd23 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 5 May 2022 18:00:18 +0200 Subject: [PATCH 135/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3e49018..133aa5f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -120,7 +120,7 @@ ncurses-terminfo-base-6.2_p20210612-r0 netcat-openbsd-1.130-r2 nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 -nginx-1.20.2-r0 +nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 openssl-1.1.1n-r0 opus-1.3.1-r1 From 09ceb8ec6bb47b6c086c967460e496660d81a504 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 9 May 2022 10:32:17 -0500 Subject: [PATCH 136/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 133aa5f..1573844 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ encodings-1.0.5-r0 eudev-libs-3.2.10-r0 expat-2.4.7-r0 fontconfig-2.13.1-r4 -freetype-2.10.4-r1 +freetype-2.10.4-r2 fribidi-1.0.10-r0 gdbm-1.19-r0 git-2.32.1-r0 From 3ceb46e54e9c74bb73be6bb210cc07744637e18d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 12 May 2022 11:00:36 -0500 Subject: [PATCH 137/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1573844..c0a13d9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libxfixes-6.0.0-r0 libxft-2.3.3-r0 libxkbcommon-1.2.1-r0 libxkbcommon-x11-1.2.1-r0 -libxml2-2.9.13-r0 +libxml2-2.9.14-r0 libxpm-3.5.13-r0 libxrender-0.9.10-r3 libxshmfence-1.3-r1 @@ -122,7 +122,7 @@ nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1n-r0 +openssl-1.1.1o-r0 opus-1.3.1-r1 orc-0.4.32-r0 p11-kit-0.23.22-r0 @@ -191,5 +191,5 @@ xcb-util-wm-0.4.1-r1 xkeyboard-config-2.33-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r0 +zlib-1.2.12-r1 zstd-libs-1.4.9-r1 From 0f60a1839b10e2dafcc7a226c7a3c5cbff6f9512 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 19 May 2022 11:22:06 -0500 Subject: [PATCH 138/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c0a13d9..a59c385 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ encodings-1.0.5-r0 eudev-libs-3.2.10-r0 expat-2.4.7-r0 fontconfig-2.13.1-r4 -freetype-2.10.4-r2 +freetype-2.10.4-r3 fribidi-1.0.10-r0 gdbm-1.19-r0 git-2.32.1-r0 @@ -44,7 +44,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 -libcrypto1.1-1.1.1n-r0 +libcrypto1.1-1.1.1o-r0 libcurl-7.79.1-r1 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 @@ -75,7 +75,7 @@ libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libseccomp-2.5.1-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1n-r0 +libssl1.1-1.1.1o-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From 1365874f03ae10f05643af4e911285ef0f4b4edb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 26 May 2022 11:00:11 -0500 Subject: [PATCH 139/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a59c385..19edcd7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ brotli-libs-1.0.9-r5 busybox-1.33.1-r7 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 -cairo-1.16.0-r3 +cairo-1.16.0-r5 cdparanoia-libs-10.2-r9 composer-2.1.9-r0 coreutils-8.32-r2 @@ -26,7 +26,7 @@ fontconfig-2.13.1-r4 freetype-2.10.4-r3 fribidi-1.0.10-r0 gdbm-1.19-r0 -git-2.32.1-r0 +git-2.32.2-r0 glib-2.68.3-r0 gmp-6.2.1-r1 gnutls-3.7.1-r0 From 5a5da8d6e783e094f046ec1914f22400e41512f4 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 30 May 2022 16:43:33 -0400 Subject: [PATCH 140/452] Update 50-config improve sed for password --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 48671e5..0b99a99 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -62,7 +62,7 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" - ESCAPED_PASSWORD=$(sed -e 's/[$\/&]/\\&/g' <<< $DB_PASS) + ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS) sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env From 4179bddddc06f61e7c820e3fd37c3aa79afee3cc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 30 May 2022 21:47:49 -0500 Subject: [PATCH 141/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 19edcd7..490ae86 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,7 +16,7 @@ cairo-1.16.0-r5 cdparanoia-libs-10.2-r9 composer-2.1.9-r0 coreutils-8.32-r2 -cups-libs-2.3.3-r2 +cups-libs-2.3.3-r3 curl-7.79.1-r1 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 From 750e15a70bdffa1d1d0494671805cc5559b6f728 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 2 Jun 2022 11:00:39 -0500 Subject: [PATCH 142/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 490ae86..09e2378 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 apache2-utils-2.4.53-r0 apk-tools-2.12.7-r0 -apr-1.7.0-r0 +apr-1.7.0-r1 apr-util-1.6.1-r7 argon2-libs-20190702-r1 avahi-libs-0.8-r5 From 7c3503a1d0ad425b64d8d273900ffa513f943309 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 9 Jun 2022 11:00:37 -0500 Subject: [PATCH 143/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 09e2378..66266f7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r1 +logrotate-3.18.1-r2 memcached-1.6.9-r0 mesa-21.1.2-r0 mesa-egl-21.1.2-r0 From 0398dba20eaa141d04e49fd6112b964ebe8b9fec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 16 Jun 2022 11:00:23 -0500 Subject: [PATCH 144/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 66266f7..c7b341b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.2.0-r16 alpine-keys-2.4-r0 alsa-lib-1.2.5-r2 -apache2-utils-2.4.53-r0 +apache2-utils-2.4.54-r0 apk-tools-2.12.7-r0 apr-1.7.0-r1 apr-util-1.6.1-r7 @@ -66,7 +66,7 @@ libmemcached-libs-1.0.18-r4 libmount-2.37.4-r0 libogg-1.3.5-r0 libpciaccess-0.16-r0 -libpcre2-16-10.36-r0 +libpcre2-16-10.36-r1 libpng-1.6.37-r1 libproc-3.3.17-r0 libressl3.3-libcrypto-3.3.6-r0 @@ -128,7 +128,7 @@ orc-0.4.32-r0 p11-kit-0.23.22-r0 pango-1.48.5-r0 pcre-8.44-r0 -pcre2-10.36-r0 +pcre2-10.36-r1 php7-7.4.26-r0 php7-common-7.4.26-r0 php7-ctype-7.4.26-r0 From 3f44534271bfc79a84ff24e76aa292430b69ccf9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 23 Jun 2022 11:00:09 -0500 Subject: [PATCH 145/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c7b341b..6eda1f1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libxv-1.0.11-r2 libxxf86vm-1.1.4-r2 libzip-1.7.3-r2 linux-pam-1.5.1-r1 -logrotate-3.18.1-r2 +logrotate-3.18.1-r3 memcached-1.6.9-r0 mesa-21.1.2-r0 mesa-egl-21.1.2-r0 From 1253e76f12d93c696d32d10c2f0685bd35e005a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 30 Jun 2022 18:00:15 +0200 Subject: [PATCH 146/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6eda1f1..ce90e44 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ cdparanoia-libs-10.2-r9 composer-2.1.9-r0 coreutils-8.32-r2 cups-libs-2.3.3-r3 -curl-7.79.1-r1 +curl-7.79.1-r2 dbus-libs-1.12.20-r2 encodings-1.0.5-r0 eudev-libs-3.2.10-r0 @@ -45,7 +45,7 @@ libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 libcrypto1.1-1.1.1o-r0 -libcurl-7.79.1-r1 +libcurl-7.79.1-r2 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 libevdev-1.11.0-r1 From 3c5a3e7fd0aa9fb300cea16d467bd3b033197979 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 7 Jul 2022 18:00:29 +0200 Subject: [PATCH 147/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ce90e44..91633d7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -44,7 +44,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 -libcrypto1.1-1.1.1o-r0 +libcrypto1.1-1.1.1p-r0 libcurl-7.79.1-r2 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 @@ -75,7 +75,7 @@ libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libseccomp-2.5.1-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1o-r0 +libssl1.1-1.1.1p-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 @@ -122,7 +122,7 @@ nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1o-r0 +openssl-1.1.1q-r0 opus-1.3.1-r1 orc-0.4.32-r0 p11-kit-0.23.22-r0 From f80eb7c2c008eacd49997d214479f2f7d33304ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 14 Jul 2022 11:00:37 -0500 Subject: [PATCH 148/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91633d7..daf644a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -26,7 +26,7 @@ fontconfig-2.13.1-r4 freetype-2.10.4-r3 fribidi-1.0.10-r0 gdbm-1.19-r0 -git-2.32.2-r0 +git-2.32.3-r0 glib-2.68.3-r0 gmp-6.2.1-r1 gnutls-3.7.1-r0 @@ -44,7 +44,7 @@ libbsd-0.11.3-r0 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcap-2.50-r0 -libcrypto1.1-1.1.1p-r0 +libcrypto1.1-1.1.1q-r0 libcurl-7.79.1-r2 libdrm-2.4.106-r0 libedit-20210216.3.1-r0 @@ -75,7 +75,7 @@ libretls-3.3.3p1-r3 libsasl-2.1.28-r0 libseccomp-2.5.1-r2 libsm-1.2.3-r0 -libssl1.1-1.1.1p-r0 +libssl1.1-1.1.1q-r0 libstdc++-10.3.1_git20210424-r2 libtasn1-4.17.0-r0 libtheora-1.1.1-r16 From 8a50be63e3e17c4acff5cb67e16ac576ef4d5745 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 21 Jul 2022 18:01:05 +0200 Subject: [PATCH 149/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index daf644a..42f47c3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,8 +115,8 @@ mtdev-1.1.6-r0 musl-1.2.2-r3 musl-utils-1.2.2-r3 nano-5.7-r2 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 +ncurses-libs-6.2_p20210612-r1 +ncurses-terminfo-base-6.2_p20210612-r1 netcat-openbsd-1.130-r2 nettle-3.7.3-r0 nghttp2-libs-1.43.0-r0 From 48cc137141a3247a486c0e2a10bf90fe30347bb4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 28 Jul 2022 09:32:58 -0500 Subject: [PATCH 150/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 42f47c3..61ed2f4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,7 +9,7 @@ argon2-libs-20190702-r1 avahi-libs-0.8-r5 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r7 +busybox-1.33.1-r8 ca-certificates-20211220-r0 ca-certificates-bundle-20211220-r0 cairo-1.16.0-r5 @@ -173,7 +173,7 @@ scanelf-1.3.2-r0 shadow-4.8.1-r0 skalibs-2.10.0.3-r0 sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r7 +ssl_client-1.33.1-r8 tar-1.34-r0 ttf-freefont-20120503-r1 tzdata-2022a-r0 From 3eb67c59cf2cdf1ad158cec046cbb8f4e31512be Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Aug 2022 13:25:32 +0200 Subject: [PATCH 151/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 61ed2f4..51aa7a5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ gdbm-1.19-r0 git-2.32.3-r0 glib-2.68.3-r0 gmp-6.2.1-r1 -gnutls-3.7.1-r0 +gnutls-3.7.1-r1 graphite2-1.3.14-r0 gst-plugins-base-1.18.4-r0 gstreamer-1.18.4-r0 From 30d4498b365d3085c0f3babdc5d8101a36a344e8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 4 Aug 2022 18:00:14 +0200 Subject: [PATCH 152/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 51aa7a5..8b2bdff 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ avahi-libs-0.8-r5 bash-5.1.16-r0 brotli-libs-1.0.9-r5 busybox-1.33.1-r8 -ca-certificates-20211220-r0 -ca-certificates-bundle-20211220-r0 +ca-certificates-20220614-r0 +ca-certificates-bundle-20220614-r0 cairo-1.16.0-r5 cdparanoia-libs-10.2-r9 composer-2.1.9-r0 From 8cf651cdf981bbaac8cb1831cbbf827fc599e2a4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 11 Aug 2022 09:26:30 -0500 Subject: [PATCH 153/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 8b2bdff..1dda291 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -191,5 +191,5 @@ xcb-util-wm-0.4.1-r1 xkeyboard-config-2.33-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r1 +zlib-1.2.12-r2 zstd-libs-1.4.9-r1 From e3c525363303176d5adbf3d346464b088a9be791 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 18 Aug 2022 18:10:36 +0200 Subject: [PATCH 154/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1dda291..28ff14a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -191,5 +191,5 @@ xcb-util-wm-0.4.1-r1 xkeyboard-config-2.33-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 -zlib-1.2.12-r2 +zlib-1.2.12-r3 zstd-libs-1.4.9-r1 From 32df06d2ab1a84430f5577c5cd4adb81f4554195 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 14 Oct 2021 16:03:09 -0500 Subject: [PATCH 155/452] Use standard nginx.conf from lsio alpine nginx base image --- Dockerfile | 64 +++++----- Dockerfile.aarch64 | 64 +++++----- Dockerfile.armhf | 64 +++++----- README.md | 1 + readme-vars.yml | 1 + root/defaults/default | 39 ------ root/defaults/nginx.conf | 98 --------------- .../nginx/site-confs/default.conf.sample | 40 ++++++ root/etc/cont-init.d/50-config | 114 ++++++++++-------- root/etc/services.d/php-fpm/run | 2 - root/var/www/html/public/index.html | 40 ++++++ 11 files changed, 249 insertions(+), 278 deletions(-) delete mode 100644 root/defaults/default delete mode 100644 root/defaults/nginx.conf create mode 100644 root/defaults/nginx/site-confs/default.conf.sample delete mode 100644 root/etc/services.d/php-fpm/run create mode 100644 root/var/www/html/public/index.html diff --git a/Dockerfile b/Dockerfile index 3f64736..7604f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 # set version label ARG BUILD_DATE @@ -11,56 +11,62 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + composer && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ curl \ - composer \ fontconfig \ memcached \ netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-gd \ + php8-ldap \ + php8-mbstring \ + php8-mysqlnd \ + php8-openssl \ + php8-pdo_mysql \ + php8-pecl-memcached \ + php8-phar \ + php8-simplexml \ + php8-tokenizer \ qt5-qtbase \ tar \ - ttf-freefont \ + ttf-freefont && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** configure php-fpm to pass env vars ****" && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ echo "**** fetch bookstack ****" && \ mkdir -p\ - /var/www/html && \ + /app/www && \ if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ - /tmp/bookstack.tar.gz -L \ + /tmp/bookstack.tar.gz -L \ "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ + /tmp/bookstack.tar.gz -C \ + /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ + composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /var/www /var/www-tmp && \ + mv /app/www /app/www-tmp && \ echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* COPY root/ / -VOLUME /config -EXPOSE 80 +EXPOSE 80 443 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3ae42f0..64a5837 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15 # set version label ARG BUILD_DATE @@ -11,56 +11,62 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + composer && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ curl \ - composer \ fontconfig \ memcached \ netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-gd \ + php8-ldap \ + php8-mbstring \ + php8-mysqlnd \ + php8-openssl \ + php8-pdo_mysql \ + php8-pecl-memcached \ + php8-phar \ + php8-simplexml \ + php8-tokenizer \ qt5-qtbase \ tar \ - ttf-freefont \ + ttf-freefont && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** configure php-fpm to pass env vars ****" && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ echo "**** fetch bookstack ****" && \ mkdir -p\ - /var/www/html && \ + /app/www && \ if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ - /tmp/bookstack.tar.gz -L \ + /tmp/bookstack.tar.gz -L \ "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ + /tmp/bookstack.tar.gz -C \ + /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ + composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /var/www /var/www-tmp && \ + mv /app/www /app/www-tmp && \ echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* COPY root/ / -VOLUME /config -EXPOSE 80 +EXPOSE 80 443 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a380eaa..ced74e8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15 # set version label ARG BUILD_DATE @@ -11,56 +11,62 @@ LABEL maintainer="homerr" ARG BOOKSTACK_RELEASE RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + composer && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ curl \ - composer \ fontconfig \ memcached \ netcat-openbsd \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-gd \ - php7-ldap \ - php7-mbstring \ - php7-memcached \ - php7-mysqlnd \ - php7-openssl \ - php7-pdo_mysql \ - php7-phar \ - php7-simplexml \ - php7-tokenizer \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-gd \ + php8-ldap \ + php8-mbstring \ + php8-mysqlnd \ + php8-openssl \ + php8-pdo_mysql \ + php8-pecl-memcached \ + php8-phar \ + php8-simplexml \ + php8-tokenizer \ qt5-qtbase \ tar \ - ttf-freefont \ + ttf-freefont && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ - echo "**** configure php-fpm ****" && \ - sed -i 's/;clear_env = no/clear_env = no/g' /etc/php7/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php7/php-fpm.conf && \ + echo "**** configure php-fpm to pass env vars ****" && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ echo "**** fetch bookstack ****" && \ mkdir -p\ - /var/www/html && \ + /app/www && \ if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ - /tmp/bookstack.tar.gz -L \ + /tmp/bookstack.tar.gz -L \ "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ tar xf \ - /tmp/bookstack.tar.gz -C \ - /var/www/html/ --strip-components=1 && \ + /tmp/bookstack.tar.gz -C \ + /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ - composer install -d /var/www/html/ && \ + composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /var/www /var/www-tmp && \ + mv /app/www /app/www-tmp && \ echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ rm -rf \ /root/.composer \ /tmp/* COPY root/ / -VOLUME /config -EXPOSE 80 +EXPOSE 80 443 diff --git a/README.md b/README.md index 055ec00..2aa0dc2 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **14.03.22:** - Add symlinks for theme support. * **11.07.21:** - Rebase to Alpine 3.14. * **12.01.21:** - Remove unused requirement, as of release 0.31.0. diff --git a/readme-vars.yml b/readme-vars.yml index 020d000..57fc1d5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "14.03.22:", desc: "Add symlinks for theme support." } - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." } diff --git a/root/defaults/default b/root/defaults/default deleted file mode 100644 index da56e4c..0000000 --- a/root/defaults/default +++ /dev/null @@ -1,39 +0,0 @@ -## Version 2018/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/default - -server { - listen 80 default_server; - - listen 443 ssl; - - root /var/www/html/public; - index index.php index.html index.htm; - - server_name _; - - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; - - client_max_body_size 0; - - error_page 599 = @noauth; - - location @noauth { - try_files $uri $uri/ /index.php?$args; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - } - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - # With php5-cgi alone: - fastcgi_pass 127.0.0.1:9000; - # With php5-fpm: - #fastcgi_pass unix:/var/run/php5-fpm.sock; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - - } -} diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf deleted file mode 100644 index 70e8488..0000000 --- a/root/defaults/nginx.conf +++ /dev/null @@ -1,98 +0,0 @@ -user abc; -worker_processes 4; -pid /run/nginx.pid; -include /etc/nginx/modules/*.conf; - -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - # server_tokens off; - - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - client_max_body_size 0; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - ## - # Logging Settings - ## - - access_log /config/log/nginx/access.log; - error_log /config/log/nginx/error.log; - - ## - # Gzip Settings - ## - - gzip on; - gzip_disable "msie6"; - - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - ## - # nginx-naxsi config - ## - # Uncomment it if you installed nginx-naxsi - ## - - #include /etc/nginx/naxsi_core.rules; - - ## - # nginx-passenger config - ## - # Uncomment it if you installed nginx-passenger - ## - - #passenger_root /usr; - #passenger_ruby /usr/bin/ruby; - - ## - # Virtual Host Configs - ## - include /etc/nginx/conf.d/*.conf; - include /config/nginx/site-confs/*; -} - - -#mail { -# # See sample authentication script at: -# # http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript -# -# # auth_http localhost/auth.php; -# # pop3_capabilities "TOP" "USER"; -# # imap_capabilities "IMAP4rev1" "UIDPLUS"; -# -# server { -# listen localhost:110; -# protocol pop3; -# proxy on; -# } -# -# server { -# listen localhost:143; -# protocol imap; -# proxy on; -# } -#} -daemon off; diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample new file mode 100644 index 0000000..6840046 --- /dev/null +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -0,0 +1,40 @@ +## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample + +server { + listen 80 default_server; + listen [::]:80 default_server; + + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name _; + + root /app/www/public; + index index.html index.htm index.php; + + error_page 599 = @noauth; + + location @noauth { + try_files $uri $uri/ /index.php?$args; + } + + location / { + # enable for basic auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + try_files $uri $uri/ /index.php?$query_string; + } + + location ~ ^(.+\.php)(.*)$ { + fastcgi_split_path_info ^(.+\.php)(.*)$; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } + + # deny access to .htaccess/.htpasswd files + location ~ /\.ht { + deny all; + } +} diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0b99a99..b3935db 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -1,9 +1,9 @@ #!/usr/bin/with-contenv bash -if [ -d /var/www-tmp ]; then +if [ -d /app/www-tmp ]; then echo "New container detected. Setting up app folder and fixing permissions." - mv /var/www-tmp /var/www - chown -R abc:abc /var/www + mv /app/www-tmp /app/www + chown -R abc:abc /app/www fi # create directory structure @@ -11,52 +11,53 @@ mkdir -p \ /config/www/{uploads,files,images,themes} # check for .env and copy default if needed -[[ ! -f "/config/www/.env" ]] && \ - cp /var/www/html/.env.example /config/www/.env - -# check for zero-length .env and alert user if found -[[ ! -s "/config/www/.env" ]] && \ - echo "WARNING: zero-length .env file detected. Please delete /config/www/.env and restart the container" +if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then + cp /app/www/.env.example /config/www/.env +fi # create symlinks symlinks=( \ -/var/www/html/themes \ -/var/www/html/storage/uploads/files \ -/var/www/html/storage/uploads/images \ -/var/www/html/public/uploads \ -/var/www/html/.env \ -/var/www/html/storage/logs/laravel.log +/app/www/themes \ +/app/www/storage/uploads/files \ +/app/www/storage/uploads/images \ +/app/www/public/uploads \ +/app/www/.env \ +/app/www/storage/logs/laravel.log ) for i in "${symlinks[@]}" do -[[ -e "$i" && ! -L "$i" ]] && rm -rf "$i" -[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" + if [[ -e "$i" && ! -L "$i" ]]; then + rm -rf "$i" + fi + if [[ ! -L "$i" ]]; then + ln -s /config/www/"$(basename "$i")" "$i" + fi done # Echo init finish for test runs if [ -n "${TEST_RUN}" ]; then - echo '[services.d] done.' + echo '[services.d] done.' fi # Create API key if needed if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; - then - echo "Generating BookStack app key for first run" - key=$(php /var/www/html/artisan key:generate --show) - echo $key > /config/BOOKSTACK_APP_KEY.txt - echo "App Key set to $key you can modify the file to update /config/BOOKSTACK_APP_KEY.txt" + then + echo "Generating BookStack app key for first run" + key=$(php /app/www/artisan key:generate --show) + echo $key > /config/BOOKSTACK_APP_KEY.txt + echo "App Key set to $key you can modify the file to update /config/BOOKSTACK_APP_KEY.txt" elif [ -f "/config/BOOKSTACK_APP_KEY.txt" ]; - then - echo "App Key found - setting variable for seds" - key=$(cat /config/BOOKSTACK_APP_KEY.txt) + then + echo "App Key found - setting variable for seds" + key=$(cat /config/BOOKSTACK_APP_KEY.txt) fi # .env file setup # check for the default app key or if it has been updated if grep -Fxq "APP_KEY=SomeRandomString" /config/www/.env || \ ! grep -Fxq "APP_KEY=${key}" /config/www/.env; then - sed -i "s#^APP_KEY=.*#APP_KEY=${key}#" /config/www/.env + sed -i "s#^APP_KEY=.*#APP_KEY=${key}#" /config/www/.env fi # check to see if db_user is set, if it is then run seds and if not then leave them if [ "${DB_USER}" ]; @@ -71,49 +72,58 @@ fi # set appurl if [ -z "${APP_URL}" ]; then - EXT_IP=$(curl -s https://icanhazip.com) - APP_URL="http://${EXT_IP}:6875" - echo "**** Docker env var APP_URL is not set, setting it to ${APP_URL} ****" + EXT_IP=$(curl -s https://icanhazip.com) + APP_URL="http://${EXT_IP}:6875" + echo "**** Docker env var APP_URL is not set, setting it to ${APP_URL} ****" fi OLD_URL=$(grep APP_URL /config/www/.env | sed 's|.*APP_URL=||g') if [ "${APP_URL}" != "${OLD_URL}" ]; then - sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env - echo "**** APP_URL in /config/www/.env is being updated from ${OLD_URL} to ${APP_URL} ****" - if [ "${OLD_URL}" != "http://example.com" ]; then - echo "**** If this is an existing install, you should run the following line from your host terminal to update the database URL entries: ****" - echo "************************************************************************" - echo "docker exec -it bookstack php /var/www/html/artisan bookstack:update-url ${OLD_URL} ${APP_URL}" - echo "************************************************************************" - fi + sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env + echo "**** APP_URL in /config/www/.env is being updated from ${OLD_URL} to ${APP_URL} ****" + if [ "${OLD_URL}" != "http://example.com" ]; then + echo "**** If this is an existing install, you should run the following line from your host terminal to update the database URL entries: ****" + echo "************************************************************************" + echo "docker exec -it bookstack php /app/www/artisan bookstack:update-url ${OLD_URL} ${APP_URL}" + echo "************************************************************************" + fi fi ## Bump php upload max filesize and post max size to 100MB by default -grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini || echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini -grep -qx '^post_max_size.*$' /config/php/php-local.ini || echo 'post_max_size = 100M' >> /config/php/php-local.ini +if ! grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini; then + echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini +fi +if ! grep -qx '^post_max_size.*$' /config/php/php-local.ini; then + echo 'post_max_size = 100M' >> /config/php/php-local.ini +fi # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do - /usr/bin/nc -z ${DB_HOST} 3306 && \ - if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ]; then - [ ! -z "${RUN}" ] && break - RUN="RAN" - # we sleep here again due to first run init on DB containers - [ ! -f /dbwait.lock ] && sleep 5 - else - sleep 1 - fi - sleep 1 + if /usr/bin/nc -z ${DB_HOST} 3306; then + if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ]; then + if [ ! -z "${RUN}" ]; then + break + fi + RUN="RAN" + # we sleep here again due to first run init on DB containers + if [ ! -f /dbwait.lock ]; then + sleep 5 + fi + else + sleep 1 + fi + fi + sleep 1 done # update database - will set up database if fresh, or, migrate existing if [ -z "${CI_RUN+x}" ]; then - php /var/www/html/artisan migrate --force + php /app/www/artisan migrate --force fi # set permissions chown -R abc:abc \ - /config + /config # set lockfile to avoid DB waits for this specific container touch /dbwait.lock diff --git a/root/etc/services.d/php-fpm/run b/root/etc/services.d/php-fpm/run deleted file mode 100644 index 4e0812f..0000000 --- a/root/etc/services.d/php-fpm/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/with-contenv bash -exec /usr/sbin/php-fpm7 -F diff --git a/root/var/www/html/public/index.html b/root/var/www/html/public/index.html new file mode 100644 index 0000000..2ac31be --- /dev/null +++ b/root/var/www/html/public/index.html @@ -0,0 +1,40 @@ + + + Upgrade Required! + + + +
+

Upgrade Required!

+

The application inside this image has been moved to a new folder.

+

You will need to update your /config/nginx/nginx.conf and /config/nginx/site-confs/default.conf in order for the application to work.

+

New config samples are located at /config/nginx/nginx.conf.sample and /config/nginx/site-confs/default.conf.sample

+

Please review our announcement: Significant changes to nginx based images

+
+ + From ed2f423949beb04cec81c67b1ac8c9c0493b9296 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 20 Aug 2022 18:53:43 -0500 Subject: [PATCH 156/452] Add default location migration --- root/migrations/02-default-location | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 root/migrations/02-default-location diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location new file mode 100644 index 0000000..7f0e6f3 --- /dev/null +++ b/root/migrations/02-default-location @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash + +DEFAULT_CONF="/config/nginx/site-confs/default.conf" +OLD_ROOT="root /var/www/html/public;" +NEW_ROOT="root /app/www/public;" + +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then + echo "updating root in ${DEFAULT_CONF}" + sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" +fi From b7028c984a7079d8a5474104612162afe6c4ffc6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 21 Aug 2022 16:11:58 +0200 Subject: [PATCH 157/452] Bot Updating Package Versions --- package_versions.txt | 224 +++++++++++++++---------------------------- 1 file changed, 75 insertions(+), 149 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 28ff14a..476c1e0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,195 +1,121 @@ -alpine-baselayout-3.2.0-r16 -alpine-keys-2.4-r0 -alsa-lib-1.2.5-r2 +alpine-baselayout-3.2.0-r18 +alpine-keys-2.4-r1 apache2-utils-2.4.54-r0 -apk-tools-2.12.7-r0 +apk-tools-2.12.7-r3 apr-1.7.0-r1 -apr-util-1.6.1-r7 +apr-util-1.6.1-r11 argon2-libs-20190702-r1 -avahi-libs-0.8-r5 bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r8 +busybox-1.34.1-r7 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 -cairo-1.16.0-r5 -cdparanoia-libs-10.2-r9 -composer-2.1.9-r0 -coreutils-8.32-r2 -cups-libs-2.3.3-r3 -curl-7.79.1-r2 -dbus-libs-1.12.20-r2 +coreutils-9.0-r2 +curl-7.80.0-r2 +dbus-libs-1.12.20-r4 encodings-1.0.5-r0 -eudev-libs-3.2.10-r0 expat-2.4.7-r0 fontconfig-2.13.1-r4 -freetype-2.10.4-r3 -fribidi-1.0.10-r0 -gdbm-1.19-r0 -git-2.32.3-r0 -glib-2.68.3-r0 -gmp-6.2.1-r1 -gnutls-3.7.1-r1 -graphite2-1.3.14-r0 -gst-plugins-base-1.18.4-r0 -gstreamer-1.18.4-r0 -harfbuzz-2.8.1-r0 -hicolor-icon-theme-0.17-r1 -hyphen-2.8.8-r1 -icu-libs-67.1-r2 +freetype-2.11.1-r2 +gdbm-1.22-r0 +git-2.34.4-r0 +glib-2.70.1-r0 +icu-libs-69.1-r1 libacl-2.2.53-r0 -libattr-2.5.1-r0 +libattr-2.5.1-r1 libblkid-2.37.4-r0 -libbsd-0.11.3-r0 +libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcap-2.50-r0 libcrypto1.1-1.1.1q-r0 -libcurl-7.79.1-r2 -libdrm-2.4.106-r0 -libedit-20210216.3.1-r0 -libevdev-1.11.0-r1 -libevent-2.1.12-r2 -libffi-3.3-r2 +libcurl-7.80.0-r2 +libedit-20210910.3.1-r0 +libevent-2.1.12-r4 +libffi-3.4.2-r1 libfontenc-1.1.4-r0 -libgcc-10.3.1_git20210424-r2 -libgcrypt-1.9.4-r0 -libgpg-error-1.42-r0 +libgcc-10.3.1_git20211027-r0 libice-1.0.10-r0 -libinput-libs-1.18.0-r0 libintl-0.21-r0 -libjpeg-turbo-2.1.0-r0 -libldap-2.4.58-r0 -libmagic-5.40-r1 +libjpeg-turbo-2.1.2-r0 +libldap-2.6.2-r0 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 libmount-2.37.4-r0 -libogg-1.3.5-r0 -libpciaccess-0.16-r0 -libpcre2-16-10.36-r1 +libpcre2-16-10.40-r0 libpng-1.6.37-r1 libproc-3.3.17-r0 -libressl3.3-libcrypto-3.3.6-r0 -libressl3.3-libssl-3.3.6-r0 -libretls-3.3.3p1-r3 +libretls-3.3.4-r3 libsasl-2.1.28-r0 -libseccomp-2.5.1-r2 +libseccomp-2.5.2-r0 libsm-1.2.3-r0 libssl1.1-1.1.1q-r0 -libstdc++-10.3.1_git20210424-r2 -libtasn1-4.17.0-r0 -libtheora-1.1.1-r16 -libunistring-0.9.10-r1 +libstdc++-10.3.1_git20211027-r0 libuuid-2.37.4-r0 -libvorbis-1.3.7-r0 -libwebp-1.2.0-r2 +libwebp-1.2.2-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 -libxcomposite-0.4.5-r0 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxfixes-6.0.0-r0 -libxft-2.3.3-r0 -libxkbcommon-1.2.1-r0 -libxkbcommon-x11-1.2.1-r0 -libxml2-2.9.14-r0 +libxml2-2.9.14-r1 +libxmu-1.1.3-r0 libxpm-3.5.13-r0 -libxrender-0.9.10-r3 -libxshmfence-1.3-r1 -libxslt-1.1.35-r0 libxt-1.2.1-r0 -libxv-1.0.11-r2 -libxxf86vm-1.1.4-r2 -libzip-1.7.3-r2 -linux-pam-1.5.1-r1 +linux-pam-1.5.2-r0 logrotate-3.18.1-r3 -memcached-1.6.9-r0 -mesa-21.1.2-r0 -mesa-egl-21.1.2-r0 -mesa-gbm-21.1.2-r0 -mesa-gl-21.1.2-r0 -mesa-glapi-21.1.2-r0 +memcached-1.6.12-r0 mkfontscale-1.2.1-r1 -mtdev-1.1.6-r0 -musl-1.2.2-r3 -musl-utils-1.2.2-r3 -nano-5.7-r2 -ncurses-libs-6.2_p20210612-r1 -ncurses-terminfo-base-6.2_p20210612-r1 -netcat-openbsd-1.130-r2 -nettle-3.7.3-r0 -nghttp2-libs-1.43.0-r0 +musl-1.2.2-r7 +musl-utils-1.2.2-r7 +nano-5.9-r0 +ncurses-libs-6.3_p20211120-r1 +ncurses-terminfo-base-6.3_p20211120-r1 +netcat-openbsd-1.130-r3 +nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 openssl-1.1.1q-r0 -opus-1.3.1-r1 -orc-0.4.32-r0 -p11-kit-0.23.22-r0 -pango-1.48.5-r0 -pcre-8.44-r0 -pcre2-10.36-r1 -php7-7.4.26-r0 -php7-common-7.4.26-r0 -php7-ctype-7.4.26-r0 -php7-curl-7.4.26-r0 -php7-dom-7.4.26-r0 -php7-fileinfo-7.4.26-r0 -php7-fpm-7.4.26-r0 -php7-gd-7.4.26-r0 -php7-iconv-7.4.26-r0 -php7-json-7.4.26-r0 -php7-ldap-7.4.26-r0 -php7-mbstring-7.4.26-r0 -php7-mysqlnd-7.4.26-r0 -php7-openssl-7.4.26-r0 -php7-pdo-7.4.26-r0 -php7-pdo_mysql-7.4.26-r0 -php7-pecl-igbinary-3.2.6-r0 -php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.26-r0 -php7-session-7.4.26-r0 -php7-simplexml-7.4.26-r0 -php7-tokenizer-7.4.26-r0 -php7-xml-7.4.26-r0 -php7-xmlwriter-7.4.26-r0 -php7-zip-7.4.26-r0 -pixman-0.40.0-r2 -pkgconf-1.7.4-r0 +pcre-8.45-r1 +pcre2-10.40-r0 +php8-8.0.18-r0 +php8-common-8.0.18-r0 +php8-ctype-8.0.18-r0 +php8-curl-8.0.18-r0 +php8-dom-8.0.18-r0 +php8-fileinfo-8.0.18-r0 +php8-fpm-8.0.18-r0 +php8-gd-8.0.18-r0 +php8-ldap-8.0.18-r0 +php8-mbstring-8.0.18-r0 +php8-mysqlnd-8.0.18-r0 +php8-openssl-8.0.18-r0 +php8-pdo-8.0.18-r0 +php8-pdo_mysql-8.0.18-r0 +php8-pecl-igbinary-3.2.6-r0 +php8-pecl-memcached-3.1.5-r1 +php8-phar-8.0.18-r0 +php8-session-8.0.18-r0 +php8-simplexml-8.0.18-r0 +php8-tokenizer-8.0.18-r0 +php8-xml-8.0.18-r0 +php8-xmlwriter-8.0.18-r0 popt-1.18-r0 procps-3.3.17-r0 -qt5-qtbase-5.15.3_git20210406-r0 -qt5-qtbase-x11-5.15.3_git20210406-r0 -qt5-qtdeclarative-5.15.3_git20210531-r0 -qt5-qtlocation-5.15.3_git20201109-r0 -qt5-qtsensors-5.15.3_git20201028-r1 -qt5-qtsvg-5.15.3_git20200406-r0 -qt5-qtwayland-5.15.3_git20210510-r0 -qt5-qtwebchannel-5.15.3_git20201028-r0 -qt5-qtwebkit-5.212.0_alpha4-r14 -readline-8.1.0-r0 -s6-ipcserver-2.10.0.3-r0 -scanelf-1.3.2-r0 -shadow-4.8.1-r0 -skalibs-2.10.0.3-r0 -sqlite-libs-3.35.5-r0 -ssl_client-1.33.1-r8 +qt5-qtbase-5.15.3_git20210713-r5 +readline-8.1.1-r0 +s6-ipcserver-2.11.0.0-r0 +scanelf-1.3.3-r0 +shadow-4.8.1-r1 +skalibs-2.11.0.0-r0 +ssl_client-1.34.1-r7 tar-1.34-r0 -ttf-freefont-20120503-r1 +ttf-freefont-20120503-r2 tzdata-2022a-r0 -utmps-0.1.0.2-r0 -wayland-libs-client-1.19.0-r0 -wayland-libs-cursor-1.19.0-r0 -wayland-libs-egl-1.19.0-r0 -wayland-libs-server-1.19.0-r0 -wkhtmltopdf-0.12.6-r0 -xcb-util-0.4.0-r3 -xcb-util-image-0.4.0-r1 -xcb-util-keysyms-0.4.0-r1 -xcb-util-renderutil-0.3.9-r1 -xcb-util-wm-0.4.1-r1 -xkeyboard-config-2.33-r0 +utmps-0.1.0.3-r0 +xdg-utils-1.1.3-r0 +xprop-1.2.5-r0 +xset-1.2.4-r0 xz-5.2.5-r1 xz-libs-5.2.5-r1 zlib-1.2.12-r3 -zstd-libs-1.4.9-r1 +zstd-libs-1.5.0-r0 From 78bd55b34987089daac48fb10c2cc9661ba1213c Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 21 Aug 2022 16:53:05 -0500 Subject: [PATCH 158/452] Keep /config volume consistently --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7604f68..3edb3fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,3 +70,4 @@ RUN \ COPY root/ / EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 64a5837..840a18c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -70,3 +70,4 @@ RUN \ COPY root/ / EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ced74e8..7965259 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -70,3 +70,4 @@ RUN \ COPY root/ / EXPOSE 80 443 +VOLUME /config From 313f1e7c0de59dcd5ddfdc8a7c0bc4866eb0a1d4 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 21 Aug 2022 17:04:32 -0500 Subject: [PATCH 159/452] Keep /config volume consistently --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.armhf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 3edb3fe..3d5e920 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,9 @@ RUN \ /root/.composer \ /tmp/* +# copy local files COPY root/ / +# ports and volumes EXPOSE 80 443 VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 840a18c..017a6ea 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -67,7 +67,9 @@ RUN \ /root/.composer \ /tmp/* +# copy local files COPY root/ / +# ports and volumes EXPOSE 80 443 VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7965259..0f79aa0 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -67,7 +67,9 @@ RUN \ /root/.composer \ /tmp/* +# copy local files COPY root/ / +# ports and volumes EXPOSE 80 443 VOLUME /config From a50d975a98d59a2b8ec43dea24e8ee8c5773ef46 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 23 Aug 2022 09:24:55 -0500 Subject: [PATCH 160/452] nginx conf tweaks --- root/defaults/nginx/site-confs/default.conf.sample | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 6840046..4171f9d 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -12,18 +12,12 @@ server { root /app/www/public; index index.html index.htm index.php; - error_page 599 = @noauth; - - location @noauth { - try_files $uri $uri/ /index.php?$args; - } - location / { # enable for basic auth #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; - try_files $uri $uri/ /index.php?$query_string; + try_files $uri $uri/ /index.php$is_args$args; } location ~ ^(.+\.php)(.*)$ { From 8d825765598d65e244f5bbb729bec8430947c873 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 25 Aug 2022 18:00:00 +0200 Subject: [PATCH 161/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 476c1e0..0868609 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -110,7 +110,7 @@ skalibs-2.11.0.0-r0 ssl_client-1.34.1-r7 tar-1.34-r0 ttf-freefont-20120503-r2 -tzdata-2022a-r0 +tzdata-2022c-r0 utmps-0.1.0.3-r0 xdg-utils-1.1.3-r0 xprop-1.2.5-r0 From c387f0126ed3a9dc82db70be3d6b1eab3f7dab67 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 8 Sep 2022 14:55:03 +0200 Subject: [PATCH 162/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0868609..4b266e2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.34.1-r7 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 -curl-7.80.0-r2 +curl-7.80.0-r3 dbus-libs-1.12.20-r4 encodings-1.0.5-r0 expat-2.4.7-r0 @@ -28,7 +28,7 @@ libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.80.0-r2 +libcurl-7.80.0-r3 libedit-20210910.3.1-r0 libevent-2.1.12-r4 libffi-3.4.2-r1 From 91408e72167bdb18a931823a1a2c3ba189a12820 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 15 Sep 2022 18:01:52 +0200 Subject: [PATCH 163/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4b266e2..f8f5e11 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -62,7 +62,7 @@ libxmu-1.1.3-r0 libxpm-3.5.13-r0 libxt-1.2.1-r0 linux-pam-1.5.2-r0 -logrotate-3.18.1-r3 +logrotate-3.18.1-r4 memcached-1.6.12-r0 mkfontscale-1.2.1-r1 musl-1.2.2-r7 From 99ac907b964380eb1f6dd7bb5f9a0e63ca63b98e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Sep 2022 14:58:01 +0200 Subject: [PATCH 164/452] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 85922db..90a5c64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -720,7 +720,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } From e301c5fb782ff2b0ad6b6d9049e5d48f4409f6ab Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 22 Sep 2022 11:03:51 -0500 Subject: [PATCH 165/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f8f5e11..364adb8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-9.0-r2 curl-7.80.0-r3 dbus-libs-1.12.20-r4 encodings-1.0.5-r0 -expat-2.4.7-r0 +expat-2.4.9-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 From 9cf173b16b7b0382497c061e2dbee07f91bc712b Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Fri, 23 Sep 2022 13:56:16 +0800 Subject: [PATCH 166/452] Extract host and port from DB_HOST --- root/etc/cont-init.d/50-config | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index b3935db..ad9bee1 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -96,11 +96,21 @@ if ! grep -qx '^post_max_size.*$' /config/php/php-local.ini; then echo 'post_max_size = 100M' >> /config/php/php-local.ini fi +# extract actual host and port from DB_HOST endpoint format, not support IPv6 +# DB_HOST enpoint 'domainIp:port' or 'domainIp' +# DB_HOST_ONLY drop ':port' portion +# DB_PORT_ONLY drop host_only portion, remains '' or ':port' +# DB_PORT_ONLY drop ':' if any, remain '' or 'port' +# ${DB_PORT_ONLY:-3306} use default 3306 if missing +DB_HOST_ONLY=${DB_HOST%:*} +DB_PORT_ONLY=${DB_HOST#$DB_HOST_ONLY} +DB_PORT_ONLY=${DB_PORT_ONLY#:} + # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) -while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do - if /usr/bin/nc -z ${DB_HOST} 3306; then - if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ]; then +while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST_ONLY+x}" ]; do + if /usr/bin/nc -z ${DB_HOST_ONLY} ${DB_PORT_ONLY:-3306}; then + if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST_ONLY} ${DB_PORT_ONLY:-3306})" ]; then if [ ! -z "${RUN}" ]; then break fi From b8bd87f0830d57221641de039698e4082fabeeb9 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 4 Oct 2022 16:20:35 -0500 Subject: [PATCH 167/452] Add default_server --- root/defaults/nginx/site-confs/default.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 4171f9d..77e9f23 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -4,8 +4,8 @@ server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; server_name _; From 06f369e0d8e8cf1b411b280a3eb42767f940dba8 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 6 Oct 2022 14:46:20 -0500 Subject: [PATCH 168/452] Update default.conf.sample --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 77e9f23..e52e78c 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; From e19234525a0ef7f22d95fceeaf086616f749c903 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 7 Oct 2022 19:44:06 +0200 Subject: [PATCH 169/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 364adb8..2dbda91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 curl-7.80.0-r3 -dbus-libs-1.12.20-r4 +dbus-libs-1.12.24-r0 encodings-1.0.5-r0 expat-2.4.9-r0 fontconfig-2.13.1-r4 From 71750e16a3d29996c3db95ff58f7a0ef1343abc5 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Sun, 9 Oct 2022 02:48:57 +0800 Subject: [PATCH 170/452] Support DB_PORT --- root/etc/cont-init.d/50-config | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index ad9bee1..6c1cfdb 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -13,6 +13,12 @@ mkdir -p \ # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then cp /app/www/.env.example /config/www/.env + + if ! grep -Fxq "DB_PORT=3306" /config/www/.env; then + # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it + sed -i "/DB_HOST=localhost/a DB_PORT=3306" /config/www/.env + echo "**** Insert DB_PORT=3306 into /config/www/.env ****" + fi fi # create symlinks @@ -68,6 +74,11 @@ if [ "${DB_USER}" ]; sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env + + if [ "${DB_PORT}" ]; + then + sed -i "s/DB_PORT=3306/DB_PORT=${DB_PORT}/g" /config/www/.env + fi fi # set appurl @@ -101,7 +112,7 @@ fi # DB_HOST_ONLY drop ':port' portion # DB_PORT_ONLY drop host_only portion, remains '' or ':port' # DB_PORT_ONLY drop ':' if any, remain '' or 'port' -# ${DB_PORT_ONLY:-3306} use default 3306 if missing +# ${DB_PORT_ONLY:-${DB_PORT:-3306}} use DB_PORT if no port provided in DB_HOST, use default 3306 if not provide DB_PORT DB_HOST_ONLY=${DB_HOST%:*} DB_PORT_ONLY=${DB_HOST#$DB_HOST_ONLY} DB_PORT_ONLY=${DB_PORT_ONLY#:} @@ -109,8 +120,8 @@ DB_PORT_ONLY=${DB_PORT_ONLY#:} # check for the mysql endpoint for 30 seconds END=$((SECONDS+30)) while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST_ONLY+x}" ]; do - if /usr/bin/nc -z ${DB_HOST_ONLY} ${DB_PORT_ONLY:-3306}; then - if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST_ONLY} ${DB_PORT_ONLY:-3306})" ]; then + if /usr/bin/nc -z ${DB_HOST_ONLY} ${DB_PORT_ONLY:-${DB_PORT:-3306}}; then + if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST_ONLY} ${DB_PORT_ONLY:-${DB_PORT:-3306}})" ]; then if [ ! -z "${RUN}" ]; then break fi From 5fa113279266a8ae6ee440956f898016a90af924 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Mon, 10 Oct 2022 14:30:21 +0800 Subject: [PATCH 171/452] Improve grep and seq matching --- root/etc/cont-init.d/50-config | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 6c1cfdb..0d21719 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -14,9 +14,9 @@ mkdir -p \ if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then cp /app/www/.env.example /config/www/.env - if ! grep -Fxq "DB_PORT=3306" /config/www/.env; then + if ! grep -xq "^DB_PORT=.*" /config/www/.env; then # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it - sed -i "/DB_HOST=localhost/a DB_PORT=3306" /config/www/.env + sed -i "/^DB_HOST=.*/a DB_PORT=3306" /config/www/.env echo "**** Insert DB_PORT=3306 into /config/www/.env ****" fi fi @@ -70,14 +70,13 @@ if [ "${DB_USER}" ]; then echo "Running config - db_user set" ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS) - sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env - sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env - sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env - - if [ "${DB_PORT}" ]; - then - sed -i "s/DB_PORT=3306/DB_PORT=${DB_PORT}/g" /config/www/.env + sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env + sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env + sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env + sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env + + if [ -n "${DB_PORT}" ]; then + sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env fi fi From f033396905edbf21fc232a4772685fc9b3a9d73a Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Mon, 10 Oct 2022 14:52:34 +0800 Subject: [PATCH 172/452] Update README support DB_PORT --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2aa0dc2..36db023 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ services: - PGID=1000 - APP_URL= - DB_HOST=bookstack_db + - DB_PORT=3306 - DB_USER=bookstack - DB_PASS= - DB_DATABASE=bookstackapp @@ -137,6 +138,7 @@ docker run -d \ -e PGID=1000 \ -e APP_URL= \ -e DB_HOST= \ + -e DB_PORT= \ -e DB_USER= \ -e DB_PASS= \ -e DB_DATABASE=bookstackapp \ @@ -157,6 +159,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PGID=1000` | for GroupID - see below for explanation | | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | +| `-e DB_PORT=` | for specifying the database port if not default 3306 | | `-e DB_USER=` | for specifying the database user | | `-e DB_PASS=` | for specifying the database password | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | From 10f9699fffc95fedaf444b09826fcf1070ca842e Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Mon, 10 Oct 2022 15:48:57 +0800 Subject: [PATCH 173/452] Add DB_HOST= to .env if previous version not have --- root/etc/cont-init.d/50-config | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 0d21719..e4d3725 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -13,12 +13,6 @@ mkdir -p \ # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then cp /app/www/.env.example /config/www/.env - - if ! grep -xq "^DB_PORT=.*" /config/www/.env; then - # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it - sed -i "/^DB_HOST=.*/a DB_PORT=3306" /config/www/.env - echo "**** Insert DB_PORT=3306 into /config/www/.env ****" - fi fi # create symlinks @@ -76,7 +70,13 @@ if [ "${DB_USER}" ]; sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env if [ -n "${DB_PORT}" ]; then - sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env + if ! grep -xq "^DB_PORT=.*" /config/www/.env; then + # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it + sed -i "/^DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env + echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****" + else + sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env + fi fi fi From d3858977d760ae3a05a64155b2c7a679b7368e9c Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 07:57:58 -0400 Subject: [PATCH 174/452] Update 50-config --- root/etc/cont-init.d/50-config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index b3935db..44f7b33 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -63,11 +63,10 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" - ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS) sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env + sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi # set appurl From 11d80548501434c545a20a2b994f216effed5df0 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:56:53 -0400 Subject: [PATCH 175/452] Update readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 57fc1d5..5ba4232 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -29,7 +29,7 @@ param_env_vars: - { env_var: "DB_HOST", env_value: "", desc: "for specifying the database host" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } - - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } + - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used (non-alphanumeric passwords must be properly escaped.)" } param_usage_include_ports: true param_ports: From f22489008197ff2740ff8c6474f22a63b53f5a61 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:58:22 -0400 Subject: [PATCH 176/452] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2aa0dc2..9913a31 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | -| `-e DB_PASS=` | for specifying the database password | +| `-e DB_PASS=` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | From 64446dabf4a29db48bd7681f6f027dedf954740f Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 09:59:35 -0400 Subject: [PATCH 177/452] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 5ba4232..d91a65d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "14.03.22:", desc: "Add symlinks for theme support." } - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } From 46db2c5bd0868de551505d4d8f69f249c9837ab9 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Mon, 10 Oct 2022 10:00:12 -0400 Subject: [PATCH 178/452] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9913a31..e67ff42 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **14.03.22:** - Add symlinks for theme support. * **11.07.21:** - Rebase to Alpine 3.14. From f9bb8bc463c421c16d5b2c5935776f5a02ab1572 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Mon, 10 Oct 2022 22:59:14 +0800 Subject: [PATCH 179/452] Revert "Update README support DB_PORT" This reverts commit f033396905edbf21fc232a4772685fc9b3a9d73a. --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 36db023..2aa0dc2 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,6 @@ services: - PGID=1000 - APP_URL= - DB_HOST=bookstack_db - - DB_PORT=3306 - DB_USER=bookstack - DB_PASS= - DB_DATABASE=bookstackapp @@ -138,7 +137,6 @@ docker run -d \ -e PGID=1000 \ -e APP_URL= \ -e DB_HOST= \ - -e DB_PORT= \ -e DB_USER= \ -e DB_PASS= \ -e DB_DATABASE=bookstackapp \ @@ -159,7 +157,6 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PGID=1000` | for GroupID - see below for explanation | | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | -| `-e DB_PORT=` | for specifying the database port if not default 3306 | | `-e DB_USER=` | for specifying the database user | | `-e DB_PASS=` | for specifying the database password | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | From 60ac384c42f9a931d896acccc26269d2f7347e57 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Mon, 10 Oct 2022 22:59:55 +0800 Subject: [PATCH 180/452] Update README support DB_PORT --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index 57fc1d5..8a60f65 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -27,6 +27,7 @@ param_usage_include_env: true param_env_vars: - { env_var: "APP_URL", env_value: "", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "", desc: "for specifying the database host" } + - { env_var: "DB_PORT", env_value: "", desc: "for specifying the database port if not default 3306" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } @@ -50,6 +51,7 @@ custom_compose: | - PGID=1000 - APP_URL= - DB_HOST=bookstack_db + - DB_PORT=3306 - DB_USER=bookstack - DB_PASS= - DB_DATABASE=bookstackapp From d16c8aab6c453036755da209508e8fb039f5cd1d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 10 Oct 2022 11:27:36 -0500 Subject: [PATCH 181/452] Bot Updating Templated Files --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e67ff42..3da97c9 100644 --- a/README.md +++ b/README.md @@ -158,8 +158,8 @@ Container images are configured using parameters passed at runtime (such as thos | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | -| `-e DB_PASS=` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | -| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | +| `-e DB_PASS=` | for specifying the database password | +| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used (non-alphanumeric passwords must be properly escaped.) | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) From 014fb2a376d0178c125efd1fa4d76c3f2fb7c0e2 Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Tue, 11 Oct 2022 16:23:51 +0800 Subject: [PATCH 182/452] fix readme-vars: properly escaped password --- readme-vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index fbe9593..ec12284 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -29,8 +29,8 @@ param_env_vars: - { env_var: "DB_HOST", env_value: "", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "", desc: "for specifying the database port if not default 3306" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } - - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used (non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password (non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } param_usage_include_ports: true param_ports: From 16c3c51494a9195ffdfad3a22c5f8fe56b2b48a8 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Tue, 11 Oct 2022 14:52:42 -0500 Subject: [PATCH 183/452] Rework logic to account for ipv6 (#1) Also, always set host and port --- root/etc/cont-init.d/50-config | 119 +++++++++++++++++---------------- 1 file changed, 62 insertions(+), 57 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 3a9ebea..4ae8497 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -8,7 +8,7 @@ fi # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes} + /config/www/{uploads,files,images,themes} # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -16,22 +16,21 @@ if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then fi # create symlinks -symlinks=( \ -/app/www/themes \ -/app/www/storage/uploads/files \ -/app/www/storage/uploads/images \ -/app/www/public/uploads \ -/app/www/.env \ -/app/www/storage/logs/laravel.log +symlinks=( + /app/www/themes + /app/www/storage/uploads/files + /app/www/storage/uploads/images + /app/www/public/uploads + /app/www/.env + /app/www/storage/logs/laravel.log ) -for i in "${symlinks[@]}" -do - if [[ -e "$i" && ! -L "$i" ]]; then - rm -rf "$i" +for i in "${symlinks[@]}"; do + if [[ -e "${i}" && ! -L "${i}" ]]; then + rm -rf "${i}" fi - if [[ ! -L "$i" ]]; then - ln -s /config/www/"$(basename "$i")" "$i" + if [[ ! -L "${i}" ]]; then + ln -s /config/www/"$(basename "${i}")" "${i}" fi done @@ -41,42 +40,58 @@ if [ -n "${TEST_RUN}" ]; then fi # Create API key if needed -if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; - then +if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; then echo "Generating BookStack app key for first run" key=$(php /app/www/artisan key:generate --show) - echo $key > /config/BOOKSTACK_APP_KEY.txt - echo "App Key set to $key you can modify the file to update /config/BOOKSTACK_APP_KEY.txt" -elif [ -f "/config/BOOKSTACK_APP_KEY.txt" ]; - then + echo "${key}" >/config/BOOKSTACK_APP_KEY.txt + echo "App Key set to ${key} you can modify the file to update /config/BOOKSTACK_APP_KEY.txt" +elif [ -f "/config/BOOKSTACK_APP_KEY.txt" ]; then echo "App Key found - setting variable for seds" key=$(cat /config/BOOKSTACK_APP_KEY.txt) fi # .env file setup # check for the default app key or if it has been updated -if grep -Fxq "APP_KEY=SomeRandomString" /config/www/.env || \ -! grep -Fxq "APP_KEY=${key}" /config/www/.env; then +if ! grep -Fxq "APP_KEY=${key}" /config/www/.env; then sed -i "s#^APP_KEY=.*#APP_KEY=${key}#" /config/www/.env fi -# check to see if db_user is set, if it is then run seds and if not then leave them -if [ "${DB_USER}" ]; - then - echo "Running config - db_user set" - sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env - sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env - sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env - - if [ -n "${DB_PORT}" ]; then - if ! grep -xq "^DB_PORT=.*" /config/www/.env; then - # add line DB_PORT=3306 to /config/www/.env because current /app/www/.env.example dont have it - sed -i "/^DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env - echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****" - else - sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env - fi - fi + +# if DB_HOST contains a port +if echo "${DB_HOST}" | grep -qP '^(?:[0-9.]+|(?:\[[0-9a-fA-F:]+\]))(:[0-9]+)$'; then + DB_HOST_PORT="${DB_HOST}" +fi + +# if DB_HOST_PORT is set +if [[ -n "${DB_HOST_PORT}" ]]; then + # if DB_PORT is set + if [[ -n "${DB_PORT}" ]]; then + echo "DB_PORT is not supported when using DB_HOST with port" + sleep infinity + fi + DB_HOST="${DB_HOST_PORT%:*}" + DB_PORT="${DB_HOST_PORT##*:}" +fi + +# if DB_PORT is not set +if [[ -z "${DB_PORT}" ]]; then + DB_PORT="3306" +fi + +# check to see if DB_HOST is set, if it is then run seds and if not then leave them +if [[ -n "${DB_HOST}" ]]; then + echo "Running config - DB_HOST set" + + if ! grep -xq "^DB_PORT=.*" /config/www/.env; then + # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it + sed -i "/^DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env + echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****" + fi + + sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env + sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env + sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env + sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env + sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi # set appurl @@ -99,28 +114,18 @@ fi ## Bump php upload max filesize and post max size to 100MB by default if ! grep -qx '^upload_max_filesize.*$' /config/php/php-local.ini; then - echo 'upload_max_filesize = 100M' >> /config/php/php-local.ini + echo 'upload_max_filesize = 100M' >>/config/php/php-local.ini fi if ! grep -qx '^post_max_size.*$' /config/php/php-local.ini; then - echo 'post_max_size = 100M' >> /config/php/php-local.ini + echo 'post_max_size = 100M' >>/config/php/php-local.ini fi -# extract actual host and port from DB_HOST endpoint format, not support IPv6 -# DB_HOST enpoint 'domainIp:port' or 'domainIp' -# DB_HOST_ONLY drop ':port' portion -# DB_PORT_ONLY drop host_only portion, remains '' or ':port' -# DB_PORT_ONLY drop ':' if any, remain '' or 'port' -# ${DB_PORT_ONLY:-${DB_PORT:-3306}} use DB_PORT if no port provided in DB_HOST, use default 3306 if not provide DB_PORT -DB_HOST_ONLY=${DB_HOST%:*} -DB_PORT_ONLY=${DB_HOST#$DB_HOST_ONLY} -DB_PORT_ONLY=${DB_PORT_ONLY#:} - # check for the mysql endpoint for 30 seconds -END=$((SECONDS+30)) -while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST_ONLY+x}" ]; do - if /usr/bin/nc -z ${DB_HOST_ONLY} ${DB_PORT_ONLY:-${DB_PORT:-3306}}; then - if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST_ONLY} ${DB_PORT_ONLY:-${DB_PORT:-3306}})" ]; then - if [ ! -z "${RUN}" ]; then +END=$((SECONDS + 30)) +while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST}" ]; do + if /usr/bin/nc -z "${DB_HOST}" "${DB_PORT}"; then + if [ -n "$(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}")" ]; then + if [ -n "${RUN}" ]; then break fi RUN="RAN" From 3b2550bfe271536d2345b35f2dc88b1a359a7c6d Mon Sep 17 00:00:00 2001 From: Tho Ho Date: Wed, 12 Oct 2022 02:37:19 +0800 Subject: [PATCH 184/452] support ipv4|[ipv6]|domain:port; fix Alpine grep P (cherry picked from commit 1fde0ad70e72c73e8062f4a2d299d2cda9a46dc6) --- root/etc/cont-init.d/50-config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 4ae8497..a920392 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -56,8 +56,9 @@ if ! grep -Fxq "APP_KEY=${key}" /config/www/.env; then sed -i "s#^APP_KEY=.*#APP_KEY=${key}#" /config/www/.env fi -# if DB_HOST contains a port -if echo "${DB_HOST}" | grep -qP '^(?:[0-9.]+|(?:\[[0-9a-fA-F:]+\]))(:[0-9]+)$'; then +# if DB_HOST contains a port and DB_HOST is not a IPv6 without brackets [..] +# support ipv4:port, [ipv6]:port, and domain:port +if echo "$DB_HOST" | grep -qE ':[0-9]+$' && ! echo "$DB_HOST" | grep -qE '^(:{0,2}[a-fA-F0-9]{1,4})+$'; then DB_HOST_PORT="${DB_HOST}" fi From 9ae485a116c4f2604fe7d3855da048897a4fc171 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 13 Oct 2022 11:11:47 -0500 Subject: [PATCH 185/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2dbda91..2e74f91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -52,7 +52,7 @@ libssl1.1-1.1.1q-r0 libstdc++-10.3.1_git20211027-r0 libuuid-2.37.4-r0 libwebp-1.2.2-r0 -libx11-1.7.2-r0 +libx11-1.7.3.1-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 From fa84257aea894f438897a44453d4434176e83e6d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 17 Oct 2022 16:43:34 +0100 Subject: [PATCH 186/452] Remove unnecessary packages --- Dockerfile | 2 -- Dockerfile.aarch64 | 2 -- Dockerfile.armhf | 2 -- 3 files changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d5e920..3cad721 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,8 @@ RUN \ composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - curl \ fontconfig \ memcached \ - netcat-openbsd \ php8-ctype \ php8-curl \ php8-dom \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 017a6ea..af97fb0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -16,10 +16,8 @@ RUN \ composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - curl \ fontconfig \ memcached \ - netcat-openbsd \ php8-ctype \ php8-curl \ php8-dom \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0f79aa0..eaf7a8f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -16,10 +16,8 @@ RUN \ composer && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - curl \ fontconfig \ memcached \ - netcat-openbsd \ php8-ctype \ php8-curl \ php8-dom \ From 697ce2a9f63351bc807bf476f01b4392c6b7b9c8 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 17 Oct 2022 16:43:46 +0100 Subject: [PATCH 187/452] Cleanup db check so it doesn't spam the console --- root/etc/cont-init.d/50-config | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 44f7b33..c363381 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -35,11 +35,6 @@ do fi done -# Echo init finish for test runs -if [ -n "${TEST_RUN}" ]; then - echo '[services.d] done.' -fi - # Create API key if needed if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; then @@ -95,24 +90,22 @@ if ! grep -qx '^post_max_size.*$' /config/php/php-local.ini; then echo 'post_max_size = 100M' >> /config/php/php-local.ini fi -# check for the mysql endpoint for 30 seconds +# check for the mysql endpoint +echo "Waiting for DB to be available" END=$((SECONDS+30)) -while [ ${SECONDS} -lt ${END} ] && [ -n "${DB_HOST+x}" ]; do - if /usr/bin/nc -z ${DB_HOST} 3306; then - if [ ! -z "$(/usr/bin/nc -w1 ${DB_HOST} 3306)" ]; then - if [ ! -z "${RUN}" ]; then - break - fi - RUN="RAN" - # we sleep here again due to first run init on DB containers - if [ ! -f /dbwait.lock ]; then - sleep 5 - fi - else - sleep 1 +while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do + if [[ $(/usr/bin/nc -w1 "${DB_HOST}" 3306 | tr -d '\0') ]]; then + if [[ -n "${RUN}" ]]; then + break + fi + RUN="RAN" + # we sleep here again due to first run init on DB containers + if [[ ! -f /dbwait.lock ]]; then + sleep 5 fi + else + sleep 1 fi - sleep 1 done # update database - will set up database if fresh, or, migrate existing From 1b04bcb2c0ca22775aef55f092a150f1bf12d2b9 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 17 Oct 2022 16:46:11 +0100 Subject: [PATCH 188/452] Update test init string --- root/etc/cont-init.d/50-config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index c363381..2d0f480 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -35,6 +35,11 @@ do fi done +# Echo init finish for test runs +if [ -n "${TEST_RUN}" ]; then + echo '[ls.io-init] done.' +fi + # Create API key if needed if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; then From 41efff8e269135b69821a77b82c41bc2f03820b6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 20 Oct 2022 16:14:50 +0000 Subject: [PATCH 189/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2e74f91..01ebf80 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,7 @@ expat-2.4.9-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 -git-2.34.4-r0 +git-2.34.5-r0 glib-2.70.1-r0 icu-libs-69.1-r1 libacl-2.2.53-r0 @@ -57,7 +57,7 @@ libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxml2-2.9.14-r1 +libxml2-2.9.14-r2 libxmu-1.1.3-r0 libxpm-3.5.13-r0 libxt-1.2.1-r0 From 675eb4ecbf528c76073678ff8614af209a949c22 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 27 Oct 2022 18:00:26 +0200 Subject: [PATCH 190/452] Bot Updating Package Versions --- package_versions.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 01ebf80..7470ab6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -14,7 +14,7 @@ coreutils-9.0-r2 curl-7.80.0-r3 dbus-libs-1.12.24-r0 encodings-1.0.5-r0 -expat-2.4.9-r0 +expat-2.5.0-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 @@ -77,28 +77,28 @@ oniguruma-6.9.7.1-r0 openssl-1.1.1q-r0 pcre-8.45-r1 pcre2-10.40-r0 -php8-8.0.18-r0 -php8-common-8.0.18-r0 -php8-ctype-8.0.18-r0 -php8-curl-8.0.18-r0 -php8-dom-8.0.18-r0 -php8-fileinfo-8.0.18-r0 -php8-fpm-8.0.18-r0 -php8-gd-8.0.18-r0 -php8-ldap-8.0.18-r0 -php8-mbstring-8.0.18-r0 -php8-mysqlnd-8.0.18-r0 -php8-openssl-8.0.18-r0 -php8-pdo-8.0.18-r0 -php8-pdo_mysql-8.0.18-r0 +php8-8.0.25-r0 +php8-common-8.0.25-r0 +php8-ctype-8.0.25-r0 +php8-curl-8.0.25-r0 +php8-dom-8.0.25-r0 +php8-fileinfo-8.0.25-r0 +php8-fpm-8.0.25-r0 +php8-gd-8.0.25-r0 +php8-ldap-8.0.25-r0 +php8-mbstring-8.0.25-r0 +php8-mysqlnd-8.0.25-r0 +php8-openssl-8.0.25-r0 +php8-pdo-8.0.25-r0 +php8-pdo_mysql-8.0.25-r0 php8-pecl-igbinary-3.2.6-r0 php8-pecl-memcached-3.1.5-r1 -php8-phar-8.0.18-r0 -php8-session-8.0.18-r0 -php8-simplexml-8.0.18-r0 -php8-tokenizer-8.0.18-r0 -php8-xml-8.0.18-r0 -php8-xmlwriter-8.0.18-r0 +php8-phar-8.0.25-r0 +php8-session-8.0.25-r0 +php8-simplexml-8.0.25-r0 +php8-tokenizer-8.0.25-r0 +php8-xml-8.0.25-r0 +php8-xmlwriter-8.0.25-r0 popt-1.18-r0 procps-3.3.17-r0 qt5-qtbase-5.15.3_git20210713-r5 From 61039b8749c57e0872d66805741aa31d7f79a9a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 2 Nov 2022 16:50:55 +0000 Subject: [PATCH 191/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7470ab6..edbb779 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.34.1-r7 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 -curl-7.80.0-r3 +curl-7.80.0-r4 dbus-libs-1.12.24-r0 encodings-1.0.5-r0 expat-2.5.0-r0 @@ -28,7 +28,7 @@ libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1q-r0 -libcurl-7.80.0-r3 +libcurl-7.80.0-r4 libedit-20210910.3.1-r0 libevent-2.1.12-r4 libffi-3.4.2-r1 @@ -74,7 +74,7 @@ netcat-openbsd-1.130-r3 nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1q-r0 +openssl-1.1.1s-r0 pcre-8.45-r1 pcre2-10.40-r0 php8-8.0.25-r0 From fd055196e85d13f75319399474a2c0f25c7e897c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 3 Nov 2022 11:17:40 -0500 Subject: [PATCH 192/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index edbb779..01f4f1c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -74,7 +74,7 @@ netcat-openbsd-1.130-r3 nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1s-r0 +openssl-1.1.1s-r1 pcre-8.45-r1 pcre2-10.40-r0 php8-8.0.25-r0 From 214aa452ae72503cf276e1e0515ccab29c004609 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Nov 2022 10:00:28 -0600 Subject: [PATCH 193/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 01f4f1c..839b4fc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -27,7 +27,7 @@ libblkid-2.37.4-r0 libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1q-r0 +libcrypto1.1-1.1.1s-r1 libcurl-7.80.0-r4 libedit-20210910.3.1-r0 libevent-2.1.12-r4 @@ -48,7 +48,7 @@ libretls-3.3.4-r3 libsasl-2.1.28-r0 libseccomp-2.5.2-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1q-r0 +libssl1.1-1.1.1s-r1 libstdc++-10.3.1_git20211027-r0 libuuid-2.37.4-r0 libwebp-1.2.2-r0 @@ -110,7 +110,7 @@ skalibs-2.11.0.0-r0 ssl_client-1.34.1-r7 tar-1.34-r0 ttf-freefont-20120503-r2 -tzdata-2022c-r0 +tzdata-2022f-r1 utmps-0.1.0.3-r0 xdg-utils-1.1.3-r0 xprop-1.2.5-r0 From ce3f942f09b369a875a0d474481712417d00e7b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Thu, 10 Nov 2022 10:41:21 -0600 Subject: [PATCH 194/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c8d9e74..8afec0b 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,8 +48,12 @@ jobs: | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/blobs/${digest}" \ - | jq -r '.container_config') + "https://ghcr.io/v2/${image}/blobs/${digest}") + if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then + image_info=$(echo $image_info | jq -r '.config') + else + image_info=$(echo $image_info | jq -r '.container_config') + fi IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then From 2493ccc5ee3f217bc11a9e55d27a8fd5e3e4dd83 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:48:50 +0100 Subject: [PATCH 195/452] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 90a5c64..7455504 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + 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/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -287,7 +287,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" From 270010ba935a7fc1d5db6c8ac402f8432e17cf5e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:50:10 +0100 Subject: [PATCH 196/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.md | 40 ------------------------- .github/ISSUE_TEMPLATE/issue.feature.md | 25 ---------------- 2 files changed, 65 deletions(-) delete mode 100755 .github/ISSUE_TEMPLATE/issue.bug.md delete mode 100755 .github/ISSUE_TEMPLATE/issue.feature.md diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md deleted file mode 100755 index 1d269c9..0000000 --- a/.github/ISSUE_TEMPLATE/issue.bug.md +++ /dev/null @@ -1,40 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - ------------------------------- - -## Expected Behavior - - -## Current Behavior - - -## Steps to Reproduce - - -1. -2. -3. -4. - -## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** - - - -## Command used to create docker container (run/create/compose/screenshot) - - -## Docker logs - diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md deleted file mode 100755 index 20a91fd..0000000 --- a/.github/ISSUE_TEMPLATE/issue.feature.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] - - - - - - - - ------------------------------- - -## Desired Behavior - - -## Current Behavior - - -## Alternatives Considered - From 8917e5dac76b333f030afab2ad3dc4d887a5ec97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 30 Nov 2022 13:51:27 +0100 Subject: [PATCH 197/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 77 +++++++++++++++++++ .github/ISSUE_TEMPLATE/issue.feature.yml | 31 ++++++++ .github/workflows/external_trigger.yml | 2 +- .../workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/stale.yml | 2 +- 8 files changed, 114 insertions(+), 6 deletions(-) create mode 100755 .github/ISSUE_TEMPLATE/issue.bug.yml create mode 100755 .github/ISSUE_TEMPLATE/issue.feature.yml diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml new file mode 100755 index 0000000..59a10f5 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -0,0 +1,77 @@ +# Based on the issue template +name: Bug report +description: Create a report to help us improve +title: "[BUG] " +labels: [Bug] +body: + - type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Current Behavior + description: Tell us what happens instead of the expected behavior. + validations: + required: true + - type: textarea + attributes: + label: Expected Behavior + description: Tell us what should happen. + validations: + required: false + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + placeholder: | + 1. In this environment... + 2. With this config... + 3. Run '...' + 4. See error... + validations: + required: true + - type: textarea + attributes: + label: Environment + description: | + examples: + - **OS**: Ubuntu 20.04 + - **How docker service was installed**: distro's packagemanager + value: | + - OS: + - How docker service was installed: + render: markdown + validations: + required: false + - type: dropdown + attributes: + label: CPU architecture + options: + - x86-64 + - arm64 + - armhf + validations: + required: true + - type: textarea + attributes: + label: Docker creation + description: | + Command used to create docker container + Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container + render: bash + validations: + required: true + - type: textarea + attributes: + description: | + Provide a full docker log, output of "docker logs linuxserver.io" + label: Container logs + placeholder: | + Output of `docker logs linuxserver.io` + render: bash + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml new file mode 100755 index 0000000..099dcdb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/issue.feature.yml @@ -0,0 +1,31 @@ +# Based on the issue template +name: Feature request +description: Suggest an idea for this project +title: "[FEAT] <title>" +labels: [enhancement] +body: + - type: checkboxes + attributes: + label: Is this a new feature request? + description: Please search to see if a feature request already exists. + options: + - label: I have searched the existing issues + required: true + - type: textarea + attributes: + label: Wanted change + description: Tell us what you want to happen. + validations: + required: true + - type: textarea + attributes: + label: Reason for change + description: Justify your request, why do you want it, what is the benefit. + validations: + required: true + - type: textarea + attributes: + label: Proposed code change + description: Do you have a potential code change in mind? + validations: + required: false diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8afec0b..9338da5 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: External Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 70dfeed..230859b 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 50c5c26..c39d90b 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 11c927a..5000ec3 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 - name: Package Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index e2b1b85..6fb6d98 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.3 + - uses: actions/checkout@v3.1.0 with: fetch-depth: '0' diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3b3846e..73dfe45 100755 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/stale@v3 + - uses: actions/stale@v6.0.1 with: stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." From 7a6a15ebee574df4d1edccfd2c2f555b2e27d534 Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Wed, 21 Dec 2022 10:17:22 -0500 Subject: [PATCH 198/452] update db info in .env file when env vars are updated --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 8 ++++---- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml new file mode 100644 index 0000000..773767c --- /dev/null +++ b/.github/workflows/call_invalid_helper.yml @@ -0,0 +1,12 @@ +name: Comment on invalid interaction +on: + issues: + types: + - labeled +jobs: + add-comment-on-invalid: + if: github.event.label.name == 'invalid' + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 + secrets: inherit diff --git a/README.md b/README.md index 3da97c9..88bcc12 100644 --- a/README.md +++ b/README.md @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.12.22:** - Update db info in .env file when env vars are updated. * **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **14.03.22:** - Add symlinks for theme support. diff --git a/readme-vars.yml b/readme-vars.yml index d91a65d..64d2d17 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -101,6 +101,7 @@ app_setup_block: | # changelog changelogs: + - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "14.03.22:", desc: "Add symlinks for theme support." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 44f7b33..4825d63 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -63,10 +63,10 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" - sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /config/www/.env - sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env - sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /config/www/.env + sed -i "s/DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env + sed -i "s/DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env + sed -i "s/DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env + sed -i "s/DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi # set appurl From 987b111e0419e8f1fe0f2b01f3013f97a998f369 Mon Sep 17 00:00:00 2001 From: Tho Ho <tho@tho.email> Date: Thu, 22 Dec 2022 22:12:55 +0800 Subject: [PATCH 199/452] Update root/etc/cont-init.d/50-config Avoid grep -E, change to regex Co-authored-by: Eric Nemchik <eric@nemchik.com> --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index a920392..3b934d8 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -58,7 +58,7 @@ fi # if DB_HOST contains a port and DB_HOST is not a IPv6 without brackets [..] # support ipv4:port, [ipv6]:port, and domain:port -if echo "$DB_HOST" | grep -qE ':[0-9]+$' && ! echo "$DB_HOST" | grep -qE '^(:{0,2}[a-fA-F0-9]{1,4})+$'; then +if [[ ${DB_HOST} =~ :[0-9]+$ ]] && ! [[ ${DB_HOST} =~ ^(:{0,2}[a-fA-F0-9]{1,4})+$ ]]; then DB_HOST_PORT="${DB_HOST}" fi From e2bd73702696e7a0ee4a06d41179242130355b17 Mon Sep 17 00:00:00 2001 From: Tho Ho <code@tho.email> Date: Fri, 23 Dec 2022 00:27:42 +0800 Subject: [PATCH 200/452] sed and grep to support .env.sample upstream comments with # --- root/etc/cont-init.d/50-config | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 3b934d8..5c249dc 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -82,17 +82,17 @@ fi if [[ -n "${DB_HOST}" ]]; then echo "Running config - DB_HOST set" - if ! grep -xq "^DB_PORT=.*" /config/www/.env; then + if ! grep -xqE "^[#]?DB_PORT=.*" /config/www/.env; then # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it - sed -i "/^DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env + sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****" fi - sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env - sed -i "s/^DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env - sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env - sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env + sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env + sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env + sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env + sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env + sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env fi # set appurl From 240d12383db3829b0caca014c168645b63d39686 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 22 Dec 2022 16:35:07 -0600 Subject: [PATCH 201/452] Bot Updating Templated Files --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88bcc12..398e761 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ services: - PGID=1000 - APP_URL= - DB_HOST=bookstack_db + - DB_PORT=3306 - DB_USER=bookstack - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp @@ -137,6 +138,7 @@ docker run -d \ -e PGID=1000 \ -e APP_URL= \ -e DB_HOST=<yourdbhost> \ + -e DB_PORT=<yourdbport> \ -e DB_USER=<yourdbuser> \ -e DB_PASS=<yourdbpass> \ -e DB_DATABASE=bookstackapp \ @@ -157,9 +159,10 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PGID=1000` | for GroupID - see below for explanation | | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=<yourdbhost>` | for specifying the database host | +| `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | | `-e DB_USER=<yourdbuser>` | for specifying the database user | -| `-e DB_PASS=<yourdbpass>` | for specifying the database password | -| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used (non-alphanumeric passwords must be properly escaped.) | +| `-e DB_PASS=<yourdbpass>` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | +| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) From 351bb78bd27bc1b5ad23f54e0eedde8498516a22 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 23 Dec 2022 10:15:29 +0000 Subject: [PATCH 202/452] Support user-supplied db port for startup check --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 2d0f480..4ac53be 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -99,7 +99,7 @@ fi echo "Waiting for DB to be available" END=$((SECONDS+30)) while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do - if [[ $(/usr/bin/nc -w1 "${DB_HOST}" 3306 | tr -d '\0') ]]; then + if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then if [[ -n "${RUN}" ]]; then break fi From 3f99b8d3b3f1f2001e08548daec29bd348548be3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 23 Dec 2022 10:23:08 -0600 Subject: [PATCH 203/452] Bot Updating Package Versions --- package_versions.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 839b4fc..c41cd0c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,7 +70,6 @@ musl-utils-1.2.2-r7 nano-5.9-r0 ncurses-libs-6.3_p20211120-r1 ncurses-terminfo-base-6.3_p20211120-r1 -netcat-openbsd-1.130-r3 nghttp2-libs-1.46.0-r0 nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 From be4b7a68055018826f12edcea2b0957a50931ddb Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Tue, 27 Dec 2022 11:14:58 -0500 Subject: [PATCH 204/452] Update readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index ac94467..bce6510 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -25,6 +25,7 @@ param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store any uploaded data on the docker host" } param_usage_include_env: true param_env_vars: + - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} - { env_var: "APP_URL", env_value: "", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "<yourdbhost>", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "<yourdbport>", desc: "for specifying the database port if not default 3306" } From 894731d11d703ad96ad6285b02e46bf505f0dc48 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 27 Dec 2022 18:00:48 +0100 Subject: [PATCH 205/452] Bot Updating Templated Files --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 398e761..eddac26 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ docker run -d \ --name=bookstack \ -e PUID=1000 \ -e PGID=1000 \ + -e TZ=Europe/London \ -e APP_URL= \ -e DB_HOST=<yourdbhost> \ -e DB_PORT=<yourdbport> \ @@ -157,6 +158,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 80` | will map the container's port 80 to port 6875 on the host | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | +| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | From 0a8973bb32705b158e80eea2d401b081640aaef2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 29 Dec 2022 17:00:12 +0100 Subject: [PATCH 206/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c41cd0c..cf14b14 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ busybox-1.34.1-r7 ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 -curl-7.80.0-r4 +curl-7.80.0-r5 dbus-libs-1.12.24-r0 encodings-1.0.5-r0 expat-2.5.0-r0 @@ -28,7 +28,7 @@ libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 libcrypto1.1-1.1.1s-r1 -libcurl-7.80.0-r4 +libcurl-7.80.0-r5 libedit-20210910.3.1-r0 libevent-2.1.12-r4 libffi-3.4.2-r1 From d3460595f807f0bd132fc82a48cdaee7e91ee3e9 Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:53:47 -0500 Subject: [PATCH 207/452] fix db password setting (sed escape &) --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eddac26..501274d 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.01.23:** - Fix db password setting (sed escape `&`). * **21.12.22:** - Update db info in .env file when env vars are updated. * **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). diff --git a/readme-vars.yml b/readme-vars.yml index bce6510..39fb35c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index e2840d0..634e127 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -92,7 +92,7 @@ if [[ -n "${DB_HOST}" ]]; then sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env + sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS//&/\\&}/g" /config/www/.env fi # set appurl From 0752ff3f7529234310964bec293dbc97c5825114 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sun, 15 Jan 2023 09:48:22 -0600 Subject: [PATCH 208/452] Format shell scripts --- root/etc/cont-init.d/50-config | 3 ++- root/etc/services.d/memcached/run | 2 ++ root/migrations/02-default-location | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 634e127..90dd0e0 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash if [ -d /app/www-tmp ]; then echo "New container detected. Setting up app folder and fixing permissions." @@ -123,7 +124,7 @@ fi # check for the mysql endpoint echo "Waiting for DB to be available" -END=$((SECONDS+30)) +END=$((SECONDS + 30)) while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then if [[ -n "${RUN}" ]]; then diff --git a/root/etc/services.d/memcached/run b/root/etc/services.d/memcached/run index bd4a49e..4ba399b 100644 --- a/root/etc/services.d/memcached/run +++ b/root/etc/services.d/memcached/run @@ -1,2 +1,4 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash + exec memcached -u abc diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index 7f0e6f3..7347d24 100644 --- a/root/migrations/02-default-location +++ b/root/migrations/02-default-location @@ -1,10 +1,11 @@ #!/usr/bin/with-contenv bash +# shellcheck shell=bash DEFAULT_CONF="/config/nginx/site-confs/default.conf" OLD_ROOT="root /var/www/html/public;" NEW_ROOT="root /app/www/public;" -if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}"; then echo "updating root in ${DEFAULT_CONF}" sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" fi From 5889c9e4ae2b5365e97721d9c9b73f13a72b6943 Mon Sep 17 00:00:00 2001 From: aptalca <aptalca@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:04:26 -0500 Subject: [PATCH 209/452] wrap .env values in quotes --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 14 +++++++------- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 501274d..f7adb9d 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **16.01.23:** - Wrap `.env` values in quotes. * **05.01.23:** - Fix db password setting (sed escape `&`). * **21.12.22:** - Update db info in .env file when env vars are updated. * **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. diff --git a/readme-vars.yml b/readme-vars.yml index 39fb35c..1db8a23 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ app_setup_block: | # changelog changelogs: + - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 90dd0e0..cb2f3ee 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -85,15 +85,15 @@ if [[ -n "${DB_HOST}" ]]; then if ! grep -xqE "^[#]?DB_PORT=.*" /config/www/.env; then # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it - sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT=${DB_PORT}" /config/www/.env - echo "**** Insert DB_PORT=${DB_PORT} into /config/www/.env ****" + sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT='${DB_PORT}'" /config/www/.env + echo "**** Insert DB_PORT='${DB_PORT}' into /config/www/.env ****" fi - sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env - sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT=${DB_PORT}/g" /config/www/.env - sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env - sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS//&/\\&}/g" /config/www/.env + sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST='${DB_HOST}'/g" /config/www/.env + sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT='${DB_PORT}'/g" /config/www/.env + sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE='${DB_DATABASE}'/g" /config/www/.env + sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME='${DB_USER}'/g" /config/www/.env + sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD='${DB_PASS//&/\\&}'/g" /config/www/.env fi # set appurl From 966414b5271a7c8179c350afe1c4b69d1f60c45f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 19 Jan 2023 17:00:58 +0100 Subject: [PATCH 210/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cf14b14..780b010 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,6 +1,6 @@ alpine-baselayout-3.2.0-r18 alpine-keys-2.4-r1 -apache2-utils-2.4.54-r0 +apache2-utils-2.4.55-r0 apk-tools-2.12.7-r3 apr-1.7.0-r1 apr-util-1.6.1-r11 @@ -18,7 +18,7 @@ expat-2.5.0-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 -git-2.34.5-r0 +git-2.34.6-r0 glib-2.70.1-r0 icu-libs-69.1-r1 libacl-2.2.53-r0 @@ -59,7 +59,7 @@ libxdmcp-1.1.3-r0 libxext-1.3.4-r0 libxml2-2.9.14-r2 libxmu-1.1.3-r0 -libxpm-3.5.13-r0 +libxpm-3.5.15-r0 libxt-1.2.1-r0 linux-pam-1.5.2-r0 logrotate-3.18.1-r4 From ebeadd336faefe328860e0ae6d537cb7b0a46a34 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Thu, 19 Jan 2023 20:18:45 -0600 Subject: [PATCH 211/452] Rebase to alpine 3.17 with php8.1 --- Dockerfile | 37 ++++++++++--------- Dockerfile.aarch64 | 37 ++++++++++--------- Dockerfile.armhf | 37 ++++++++++--------- README.md | 1 + readme-vars.yml | 1 + .../dependencies.d/init-nginx-end | 0 .../s6-rc.d/init-bookstack-config/run} | 6 +-- .../s6-rc.d/init-bookstack-config/type | 1 + .../s6-rc.d/init-bookstack-config/up | 1 + .../dependencies.d/init-services | 0 .../s6-rc.d/svc-memcached}/run | 0 .../etc/s6-overlay/s6-rc.d/svc-memcached/type | 1 + .../user/contents.d/init-bookstack-config | 0 .../s6-rc.d/user/contents.d/svc-memcached | 0 14 files changed, 65 insertions(+), 57 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/dependencies.d/init-nginx-end rename root/etc/{cont-init.d/50-config => s6-overlay/s6-rc.d/init-bookstack-config/run} (98%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-bookstack-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-memcached/dependencies.d/init-services rename root/etc/{services.d/memcached => s6-overlay/s6-rc.d/svc-memcached}/run (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-memcached/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bookstack-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-memcached diff --git a/Dockerfile b/Dockerfile index 3cad721..dbc3ee8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17 # set version label ARG BUILD_DATE @@ -18,29 +20,28 @@ RUN \ apk add --no-cache \ fontconfig \ memcached \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-ldap \ - php8-mbstring \ - php8-mysqlnd \ - php8-openssl \ - php8-pdo_mysql \ - php8-pecl-memcached \ - php8-phar \ - php8-simplexml \ - php8-tokenizer \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-ldap \ + php81-mbstring \ + php81-mysqlnd \ + php81-openssl \ + php81-pdo_mysql \ + php81-pecl-memcached \ + php81-phar \ + php81-simplexml \ + php81-tokenizer \ qt5-qtbase \ - tar \ ttf-freefont && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + 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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index af97fb0..ca91f52 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17 # set version label ARG BUILD_DATE @@ -18,29 +20,28 @@ RUN \ apk add --no-cache \ fontconfig \ memcached \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-ldap \ - php8-mbstring \ - php8-mysqlnd \ - php8-openssl \ - php8-pdo_mysql \ - php8-pecl-memcached \ - php8-phar \ - php8-simplexml \ - php8-tokenizer \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-ldap \ + php81-mbstring \ + php81-mysqlnd \ + php81-openssl \ + php81-pdo_mysql \ + php81-pecl-memcached \ + php81-phar \ + php81-simplexml \ + php81-tokenizer \ qt5-qtbase \ - tar \ ttf-freefont && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + 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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index eaf7a8f..ce376d8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15 +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17 # set version label ARG BUILD_DATE @@ -18,29 +20,28 @@ RUN \ apk add --no-cache \ fontconfig \ memcached \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-gd \ - php8-ldap \ - php8-mbstring \ - php8-mysqlnd \ - php8-openssl \ - php8-pdo_mysql \ - php8-pecl-memcached \ - php8-phar \ - php8-simplexml \ - php8-tokenizer \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-gd \ + php81-ldap \ + php81-mbstring \ + php81-mysqlnd \ + php81-openssl \ + php81-pdo_mysql \ + php81-pecl-memcached \ + php81-phar \ + php81-simplexml \ + php81-tokenizer \ qt5-qtbase \ - tar \ ttf-freefont && \ apk add --no-cache \ --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ wkhtmltopdf && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php8/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + 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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/README.md b/README.md index f7adb9d..94257dd 100644 --- a/README.md +++ b/README.md @@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.08.22:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Wrap `.env` values in quotes. * **05.01.23:** - Fix db password setting (sed escape `&`). * **21.12.22:** - Update db info in .env file when env vars are updated. diff --git a/readme-vars.yml b/readme-vars.yml index 1db8a23..6ae17d1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ app_setup_block: | # changelog changelogs: + - { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/dependencies.d/init-nginx-end b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/dependencies.d/init-nginx-end new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/50-config b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run old mode 100644 new mode 100755 similarity index 98% rename from root/etc/cont-init.d/50-config rename to root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index cb2f3ee..616f6fa --- a/root/etc/cont-init.d/50-config +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -4,7 +4,7 @@ if [ -d /app/www-tmp ]; then echo "New container detected. Setting up app folder and fixing permissions." mv /app/www-tmp /app/www - chown -R abc:abc /app/www + lsiown -R abc:abc /app/www fi # create directory structure @@ -145,8 +145,8 @@ if [ -z "${CI_RUN+x}" ]; then php /app/www/artisan migrate --force fi -# set permissions -chown -R abc:abc \ +# permissions +lsiown -R abc:abc \ /config # set lockfile to avoid DB waits for this specific container diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/type b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/up b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/up new file mode 100644 index 0000000..c9f39e1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-bookstack-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-memcached/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-memcached/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/memcached/run b/root/etc/s6-overlay/s6-rc.d/svc-memcached/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/services.d/memcached/run rename to root/etc/s6-overlay/s6-rc.d/svc-memcached/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-memcached/type b/root/etc/s6-overlay/s6-rc.d/svc-memcached/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-memcached/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bookstack-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-bookstack-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-memcached b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-memcached new file mode 100644 index 0000000..e69de29 From 231349b8420eeb7341391e943b96043697461dfa Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Thu, 19 Jan 2023 20:39:21 -0600 Subject: [PATCH 212/452] Fix date --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94257dd..e0e9ae3 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **20.08.22:** - Rebase to alpine 3.17 with php8.1. +* **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Wrap `.env` values in quotes. * **05.01.23:** - Fix db password setting (sed escape `&`). * **21.12.22:** - Update db info in .env file when env vars are updated. diff --git a/readme-vars.yml b/readme-vars.yml index 6ae17d1..3ab3d19 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,7 +104,7 @@ app_setup_block: | # changelog changelogs: - - { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." } + - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } From 1603fb13fcf14f0120b03b29dc13a45f0d5d69f5 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Fri, 20 Jan 2023 18:15:13 -0600 Subject: [PATCH 213/452] Remove base packages --- Dockerfile | 6 ------ Dockerfile.aarch64 | 6 ------ Dockerfile.armhf | 6 ------ 3 files changed, 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbc3ee8..6802742 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,19 +25,13 @@ RUN \ php81-dom \ php81-gd \ php81-ldap \ - php81-mbstring \ php81-mysqlnd \ - php81-openssl \ php81-pdo_mysql \ php81-pecl-memcached \ php81-phar \ - php81-simplexml \ php81-tokenizer \ qt5-qtbase \ ttf-freefont && \ - apk add --no-cache \ - --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ - wkhtmltopdf && \ 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 && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ca91f52..ed69a01 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -25,19 +25,13 @@ RUN \ php81-dom \ php81-gd \ php81-ldap \ - php81-mbstring \ php81-mysqlnd \ - php81-openssl \ php81-pdo_mysql \ php81-pecl-memcached \ php81-phar \ - php81-simplexml \ php81-tokenizer \ qt5-qtbase \ ttf-freefont && \ - apk add --no-cache \ - --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ - wkhtmltopdf && \ 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 && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index ce376d8..c0ded28 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -25,19 +25,13 @@ RUN \ php81-dom \ php81-gd \ php81-ldap \ - php81-mbstring \ php81-mysqlnd \ - php81-openssl \ php81-pdo_mysql \ php81-pecl-memcached \ php81-phar \ - php81-simplexml \ php81-tokenizer \ qt5-qtbase \ ttf-freefont && \ - apk add --no-cache \ - --repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \ - wkhtmltopdf && \ 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 && \ From 288cb8d25be6c9f6a248a4b1b44254471f8fe3ba Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Fri, 20 Jan 2023 18:18:44 -0600 Subject: [PATCH 214/452] Remove -tmp logic --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 7 +------ 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6802742..1839d1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ RUN \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www-tmp && \ + mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ed69a01..f8ca346 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -52,7 +52,7 @@ RUN \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www-tmp && \ + mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c0ded28..9283445 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -52,7 +52,7 @@ RUN \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www-tmp && \ + mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 616f6fa..a4da96b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -1,12 +1,6 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -if [ -d /app/www-tmp ]; then - echo "New container detected. Setting up app folder and fixing permissions." - mv /app/www-tmp /app/www - lsiown -R abc:abc /app/www -fi - # create directory structure mkdir -p \ /config/www/{uploads,files,images,themes} @@ -147,6 +141,7 @@ fi # permissions lsiown -R abc:abc \ + /app/www/storage \ /config # set lockfile to avoid DB waits for this specific container From 4b7807780be579f3eaffb0017784ab9c7f662e17 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Fri, 20 Jan 2023 18:51:08 -0600 Subject: [PATCH 215/452] Remove -tmp logic --- Dockerfile | 2 -- Dockerfile.aarch64 | 2 -- Dockerfile.armhf | 2 -- 3 files changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1839d1b..24f2349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,8 +51,6 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ - echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f8ca346..1b5d8f7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -51,8 +51,6 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ - echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9283445..74760ac 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -51,8 +51,6 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ - echo "**** overlay-fs bug workaround ****" && \ - mv /app/www /app/www && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ From 0b903bdfefa4f8432ba3be5deeaf3a09b5517f1f Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sun, 22 Jan 2023 14:48:04 -0600 Subject: [PATCH 216/452] Fix dependencies --- .../s6-rc.d/init-config-end/dependencies.d/init-bookstack-config | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bookstack-config diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bookstack-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-bookstack-config new file mode 100644 index 0000000..e69de29 From 6aaf90dff80b797bd094d53b83a1233617cd0a32 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Jan 2023 11:04:20 -0600 Subject: [PATCH 217/452] Bot Updating Package Versions --- package_versions.txt | 229 ++++++++++++++++++++++--------------------- 1 file changed, 115 insertions(+), 114 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 780b010..3fea942 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,120 +1,121 @@ -alpine-baselayout-3.2.0-r18 +alpine-baselayout-3.4.0-r0 +alpine-baselayout-data-3.4.0-r0 alpine-keys-2.4-r1 +alpine-release-3.17.1-r0 +aom-libs-3.5.0-r0 apache2-utils-2.4.55-r0 -apk-tools-2.12.7-r3 -apr-1.7.0-r1 -apr-util-1.6.1-r11 -argon2-libs-20190702-r1 -bash-5.1.16-r0 -brotli-libs-1.0.9-r5 -busybox-1.34.1-r7 -ca-certificates-20220614-r0 -ca-certificates-bundle-20220614-r0 -coreutils-9.0-r2 -curl-7.80.0-r5 -dbus-libs-1.12.24-r0 -encodings-1.0.5-r0 -expat-2.5.0-r0 -fontconfig-2.13.1-r4 -freetype-2.11.1-r2 -gdbm-1.22-r0 -git-2.34.6-r0 -glib-2.70.1-r0 -icu-libs-69.1-r1 -libacl-2.2.53-r0 -libattr-2.5.1-r1 -libblkid-2.37.4-r0 -libbsd-0.11.3-r1 -libbz2-1.0.8-r1 +apk-tools-2.12.10-r1 +apr-1.7.0-r2 +apr-util-1.6.1-r14 +argon2-libs-20190702-r2 +bash-5.2.15-r0 +brotli-libs-1.0.9-r9 +busybox-1.35.0-r29 +busybox-binsh-1.35.0-r29 +ca-certificates-20220614-r4 +ca-certificates-bundle-20220614-r4 +coreutils-9.1-r0 +curl-7.87.0-r1 +dbus-libs-1.14.4-r0 +encodings-1.0.6-r0 +font-freefont-20120503-r3 +fontconfig-2.14.1-r0 +freetype-2.12.1-r0 +gdbm-1.23-r0 +git-2.38.3-r1 +glib-2.74.5-r0 +icu-data-full-72.1-r1 +icu-libs-72.1-r1 +jq-1.6-r2 +libacl-2.3.1-r1 +libattr-2.5.1-r2 +libavif-0.11.1-r0 +libblkid-2.38.1-r1 +libbsd-0.11.7-r0 +libbz2-1.0.8-r4 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1s-r1 -libcurl-7.80.0-r5 -libedit-20210910.3.1-r0 -libevent-2.1.12-r4 -libffi-3.4.2-r1 -libfontenc-1.1.4-r0 -libgcc-10.3.1_git20211027-r0 -libice-1.0.10-r0 -libintl-0.21-r0 -libjpeg-turbo-2.1.2-r0 -libldap-2.6.2-r0 -libmd-1.0.3-r0 -libmemcached-libs-1.0.18-r4 -libmount-2.37.4-r0 -libpcre2-16-10.40-r0 -libpng-1.6.37-r1 -libproc-3.3.17-r0 -libretls-3.3.4-r3 -libsasl-2.1.28-r0 -libseccomp-2.5.2-r0 -libsm-1.2.3-r0 -libssl1.1-1.1.1s-r1 -libstdc++-10.3.1_git20211027-r0 -libuuid-2.37.4-r0 -libwebp-1.2.2-r0 -libx11-1.7.3.1-r0 -libxau-1.0.9-r0 -libxcb-1.14-r2 -libxdmcp-1.1.3-r0 -libxext-1.3.4-r0 -libxml2-2.9.14-r2 -libxmu-1.1.3-r0 +libcrypto3-3.0.7-r2 +libcurl-7.87.0-r1 +libdav1d-1.0.0-r2 +libedit-20221030.3.1-r0 +libevent-2.1.12-r5 +libexpat-2.5.0-r0 +libffi-3.4.4-r0 +libfontenc-1.1.6-r0 +libgcc-12.2.1_git20220924-r4 +libice-1.0.10-r1 +libintl-0.21.1-r1 +libjpeg-turbo-2.1.4-r0 +libldap-2.6.3-r6 +libmd-1.0.4-r0 +libmemcached-libs-1.0.18-r5 +libmount-2.38.1-r1 +libpcre2-16-10.42-r0 +libpng-1.6.38-r0 +libproc-3.3.17-r2 +libsasl-2.1.28-r3 +libseccomp-2.5.4-r0 +libsm-1.2.3-r1 +libssl3-3.0.7-r2 +libstdc++-12.2.1_git20220924-r4 +libuuid-2.38.1-r1 +libwebp-1.2.4-r1 +libx11-1.8.3-r1 +libxau-1.0.10-r0 +libxcb-1.15-r0 +libxdmcp-1.1.4-r0 +libxext-1.3.5-r0 +libxml2-2.10.3-r1 libxpm-3.5.15-r0 libxt-1.2.1-r0 -linux-pam-1.5.2-r0 -logrotate-3.18.1-r4 -memcached-1.6.12-r0 -mkfontscale-1.2.1-r1 -musl-1.2.2-r7 -musl-utils-1.2.2-r7 -nano-5.9-r0 -ncurses-libs-6.3_p20211120-r1 -ncurses-terminfo-base-6.3_p20211120-r1 -nghttp2-libs-1.46.0-r0 -nginx-1.20.2-r1 -oniguruma-6.9.7.1-r0 -openssl-1.1.1s-r1 -pcre-8.45-r1 -pcre2-10.40-r0 -php8-8.0.25-r0 -php8-common-8.0.25-r0 -php8-ctype-8.0.25-r0 -php8-curl-8.0.25-r0 -php8-dom-8.0.25-r0 -php8-fileinfo-8.0.25-r0 -php8-fpm-8.0.25-r0 -php8-gd-8.0.25-r0 -php8-ldap-8.0.25-r0 -php8-mbstring-8.0.25-r0 -php8-mysqlnd-8.0.25-r0 -php8-openssl-8.0.25-r0 -php8-pdo-8.0.25-r0 -php8-pdo_mysql-8.0.25-r0 -php8-pecl-igbinary-3.2.6-r0 -php8-pecl-memcached-3.1.5-r1 -php8-phar-8.0.25-r0 -php8-session-8.0.25-r0 -php8-simplexml-8.0.25-r0 -php8-tokenizer-8.0.25-r0 -php8-xml-8.0.25-r0 -php8-xmlwriter-8.0.25-r0 -popt-1.18-r0 -procps-3.3.17-r0 -qt5-qtbase-5.15.3_git20210713-r5 -readline-8.1.1-r0 -s6-ipcserver-2.11.0.0-r0 -scanelf-1.3.3-r0 -shadow-4.8.1-r1 -skalibs-2.11.0.0-r0 -ssl_client-1.34.1-r7 -tar-1.34-r0 -ttf-freefont-20120503-r2 +linux-pam-1.5.2-r1 +logrotate-3.20.1-r3 +memcached-1.6.17-r0 +mkfontscale-1.2.2-r1 +musl-1.2.3-r4 +musl-utils-1.2.3-r4 +nano-7.0-r0 +ncurses-libs-6.3_p20221119-r0 +ncurses-terminfo-base-6.3_p20221119-r0 +nghttp2-libs-1.51.0-r0 +nginx-1.22.1-r0 +oniguruma-6.9.8-r0 +openssl-3.0.7-r2 +pcre-8.45-r2 +pcre2-10.42-r0 +php81-8.1.14-r0 +php81-common-8.1.14-r0 +php81-ctype-8.1.14-r0 +php81-curl-8.1.14-r0 +php81-dom-8.1.14-r0 +php81-fileinfo-8.1.14-r0 +php81-fpm-8.1.14-r0 +php81-gd-8.1.14-r0 +php81-ldap-8.1.14-r0 +php81-mbstring-8.1.14-r0 +php81-mysqlnd-8.1.14-r0 +php81-openssl-8.1.14-r0 +php81-pdo-8.1.14-r0 +php81-pdo_mysql-8.1.14-r0 +php81-pecl-igbinary-3.2.12-r0 +php81-pecl-memcached-3.2.0-r0 +php81-phar-8.1.14-r0 +php81-session-8.1.14-r0 +php81-simplexml-8.1.14-r0 +php81-tokenizer-8.1.14-r0 +php81-xml-8.1.14-r0 +php81-xmlwriter-8.1.14-r0 +popt-1.19-r0 +procps-3.3.17-r2 +qt5-qtbase-5.15.6_git20221010-r0 +readline-8.2.0-r0 +scanelf-1.3.5-r1 +shadow-4.13-r0 +skalibs-2.12.0.1-r0 +ssl_client-1.35.0-r29 tzdata-2022f-r1 -utmps-0.1.0.3-r0 -xdg-utils-1.1.3-r0 -xprop-1.2.5-r0 -xset-1.2.4-r0 -xz-5.2.5-r1 -xz-libs-5.2.5-r1 -zlib-1.2.12-r3 -zstd-libs-1.5.0-r0 +utmps-libs-0.1.2.0-r1 +xz-5.2.9-r0 +xz-libs-5.2.9-r0 +zlib-1.2.13-r0 +zstd-libs-1.5.2-r9 From 66af27334f0a3f12146efb92775dcf451a92ad3c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Feb 2023 06:46:33 -0600 Subject: [PATCH 218/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 3fea942..221d5f1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-release-3.17.1-r0 aom-libs-3.5.0-r0 apache2-utils-2.4.55-r0 apk-tools-2.12.10-r1 -apr-1.7.0-r2 +apr-1.7.1-r0 apr-util-1.6.1-r14 argon2-libs-20190702-r2 bash-5.2.15-r0 From 0f9e3082e08483d8efe35f6cbc44c06b6de29d2c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 9 Feb 2023 10:00:13 -0600 Subject: [PATCH 219/452] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 221d5f1..62dea17 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,8 +5,8 @@ alpine-release-3.17.1-r0 aom-libs-3.5.0-r0 apache2-utils-2.4.55-r0 apk-tools-2.12.10-r1 -apr-1.7.1-r0 -apr-util-1.6.1-r14 +apr-1.7.2-r0 +apr-util-1.6.3-r0 argon2-libs-20190702-r2 bash-5.2.15-r0 brotli-libs-1.0.9-r9 @@ -60,7 +60,7 @@ libssl3-3.0.7-r2 libstdc++-12.2.1_git20220924-r4 libuuid-2.38.1-r1 libwebp-1.2.4-r1 -libx11-1.8.3-r1 +libx11-1.8.4-r0 libxau-1.0.10-r0 libxcb-1.15-r0 libxdmcp-1.1.4-r0 @@ -80,31 +80,31 @@ ncurses-terminfo-base-6.3_p20221119-r0 nghttp2-libs-1.51.0-r0 nginx-1.22.1-r0 oniguruma-6.9.8-r0 -openssl-3.0.7-r2 +openssl-3.0.8-r0 pcre-8.45-r2 pcre2-10.42-r0 -php81-8.1.14-r0 -php81-common-8.1.14-r0 -php81-ctype-8.1.14-r0 -php81-curl-8.1.14-r0 -php81-dom-8.1.14-r0 -php81-fileinfo-8.1.14-r0 -php81-fpm-8.1.14-r0 -php81-gd-8.1.14-r0 -php81-ldap-8.1.14-r0 -php81-mbstring-8.1.14-r0 -php81-mysqlnd-8.1.14-r0 -php81-openssl-8.1.14-r0 -php81-pdo-8.1.14-r0 -php81-pdo_mysql-8.1.14-r0 +php81-8.1.15-r0 +php81-common-8.1.15-r0 +php81-ctype-8.1.15-r0 +php81-curl-8.1.15-r0 +php81-dom-8.1.15-r0 +php81-fileinfo-8.1.15-r0 +php81-fpm-8.1.15-r0 +php81-gd-8.1.15-r0 +php81-ldap-8.1.15-r0 +php81-mbstring-8.1.15-r0 +php81-mysqlnd-8.1.15-r0 +php81-openssl-8.1.15-r0 +php81-pdo-8.1.15-r0 +php81-pdo_mysql-8.1.15-r0 php81-pecl-igbinary-3.2.12-r0 php81-pecl-memcached-3.2.0-r0 -php81-phar-8.1.14-r0 -php81-session-8.1.14-r0 -php81-simplexml-8.1.14-r0 -php81-tokenizer-8.1.14-r0 -php81-xml-8.1.14-r0 -php81-xmlwriter-8.1.14-r0 +php81-phar-8.1.15-r0 +php81-session-8.1.15-r0 +php81-simplexml-8.1.15-r0 +php81-tokenizer-8.1.15-r0 +php81-xml-8.1.15-r0 +php81-xmlwriter-8.1.15-r0 popt-1.19-r0 procps-3.3.17-r2 qt5-qtbase-5.15.6_git20221010-r0 From d348118c54d86104d834f2690abb00d55083d96b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 16 Feb 2023 16:59:27 +0100 Subject: [PATCH 220/452] Bot Updating Templated Files --- Jenkinsfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7455504..972ba74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + 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/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -815,19 +815,19 @@ pipeline { echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -835,13 +835,13 @@ pipeline { docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-latest + docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} @@ -987,12 +987,12 @@ pipeline { sh 'echo "build aborted"' } else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\ + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } From 292160dfdd8f7721cd7ac0a0e95e7503742e5758 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 16 Feb 2023 10:01:12 -0600 Subject: [PATCH 221/452] Bot Updating Templated Files --- .editorconfig | 2 +- .github/workflows/greetings.yml | 2 +- .github/workflows/permissions.yml | 9 +++++++++ README.md | 7 ++++--- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100755 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig index a92f7df..5f150f3 100755 --- a/.editorconfig +++ b/.editorconfig @@ -15,6 +15,6 @@ trim_trailing_whitespace = false indent_style = space indent_size = 2 -[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}] +[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}] indent_style = space indent_size = 4 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index c39d90b..7ada469 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml new file mode 100755 index 0000000..2df6b61 --- /dev/null +++ b/.github/workflows/permissions.yml @@ -0,0 +1,9 @@ +name: Permission check +on: + pull_request: + paths: + - '**/run' + - '**/finish' +jobs: + permission_check: + uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/README.md b/README.md index e0e9ae3..d13f4e8 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf| ✅ | arm32v7-\<version tag\> | +| armhf | ✅ | arm32v7-\<version tag\> | ## Application Setup @@ -136,7 +136,7 @@ docker run -d \ --name=bookstack \ -e PUID=1000 \ -e PGID=1000 \ - -e TZ=Europe/London \ + -e TZ=Etc/UTC \ -e APP_URL= \ -e DB_HOST=<yourdbhost> \ -e DB_PORT=<yourdbport> \ @@ -147,6 +147,7 @@ docker run -d \ -v /path/to/data:/config \ --restart unless-stopped \ lscr.io/linuxserver/bookstack:latest + ``` ## Parameters @@ -158,7 +159,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-p 80` | will map the container's port 80 to port 6875 on the host | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | -| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London | +| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | From abfae9ed0c9bfdd58df09568208e6e0eabead6c1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 16 Feb 2023 17:03:42 +0100 Subject: [PATCH 222/452] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 62dea17..543420e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ alpine-baselayout-3.4.0-r0 alpine-baselayout-data-3.4.0-r0 alpine-keys-2.4-r1 -alpine-release-3.17.1-r0 +alpine-release-3.17.2-r0 aom-libs-3.5.0-r0 apache2-utils-2.4.55-r0 apk-tools-2.12.10-r1 @@ -22,7 +22,7 @@ font-freefont-20120503-r3 fontconfig-2.14.1-r0 freetype-2.12.1-r0 gdbm-1.23-r0 -git-2.38.3-r1 +git-2.38.4-r0 glib-2.74.5-r0 icu-data-full-72.1-r1 icu-libs-72.1-r1 @@ -34,7 +34,7 @@ libblkid-2.38.1-r1 libbsd-0.11.7-r0 libbz2-1.0.8-r4 libc-utils-0.7.2-r3 -libcrypto3-3.0.7-r2 +libcrypto3-3.0.8-r0 libcurl-7.87.0-r1 libdav1d-1.0.0-r2 libedit-20221030.3.1-r0 @@ -56,7 +56,7 @@ libproc-3.3.17-r2 libsasl-2.1.28-r3 libseccomp-2.5.4-r0 libsm-1.2.3-r1 -libssl3-3.0.7-r2 +libssl3-3.0.8-r0 libstdc++-12.2.1_git20220924-r4 libuuid-2.38.1-r1 libwebp-1.2.4-r1 @@ -83,28 +83,28 @@ oniguruma-6.9.8-r0 openssl-3.0.8-r0 pcre-8.45-r2 pcre2-10.42-r0 -php81-8.1.15-r0 -php81-common-8.1.15-r0 -php81-ctype-8.1.15-r0 -php81-curl-8.1.15-r0 -php81-dom-8.1.15-r0 -php81-fileinfo-8.1.15-r0 -php81-fpm-8.1.15-r0 -php81-gd-8.1.15-r0 -php81-ldap-8.1.15-r0 -php81-mbstring-8.1.15-r0 -php81-mysqlnd-8.1.15-r0 -php81-openssl-8.1.15-r0 -php81-pdo-8.1.15-r0 -php81-pdo_mysql-8.1.15-r0 +php81-8.1.16-r0 +php81-common-8.1.16-r0 +php81-ctype-8.1.16-r0 +php81-curl-8.1.16-r0 +php81-dom-8.1.16-r0 +php81-fileinfo-8.1.16-r0 +php81-fpm-8.1.16-r0 +php81-gd-8.1.16-r0 +php81-ldap-8.1.16-r0 +php81-mbstring-8.1.16-r0 +php81-mysqlnd-8.1.16-r0 +php81-openssl-8.1.16-r0 +php81-pdo-8.1.16-r0 +php81-pdo_mysql-8.1.16-r0 php81-pecl-igbinary-3.2.12-r0 php81-pecl-memcached-3.2.0-r0 -php81-phar-8.1.15-r0 -php81-session-8.1.15-r0 -php81-simplexml-8.1.15-r0 -php81-tokenizer-8.1.15-r0 -php81-xml-8.1.15-r0 -php81-xmlwriter-8.1.15-r0 +php81-phar-8.1.16-r0 +php81-session-8.1.16-r0 +php81-simplexml-8.1.16-r0 +php81-tokenizer-8.1.16-r0 +php81-xml-8.1.16-r0 +php81-xmlwriter-8.1.16-r0 popt-1.19-r0 procps-3.3.17-r2 qt5-qtbase-5.15.6_git20221010-r0 From 67659ad9cd86ee5757994d60cbe23a9c620bb3ee Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 23 Feb 2023 10:00:37 -0600 Subject: [PATCH 223/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 543420e..131670f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,7 +15,7 @@ busybox-binsh-1.35.0-r29 ca-certificates-20220614-r4 ca-certificates-bundle-20220614-r4 coreutils-9.1-r0 -curl-7.87.0-r1 +curl-7.87.0-r2 dbus-libs-1.14.4-r0 encodings-1.0.6-r0 font-freefont-20120503-r3 @@ -35,7 +35,7 @@ libbsd-0.11.7-r0 libbz2-1.0.8-r4 libc-utils-0.7.2-r3 libcrypto3-3.0.8-r0 -libcurl-7.87.0-r1 +libcurl-7.87.0-r2 libdav1d-1.0.0-r2 libedit-20221030.3.1-r0 libevent-2.1.12-r5 From 9c8985d8c7b9777f05c75739237f1c9034aff740 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 26 Feb 2023 05:21:06 -0600 Subject: [PATCH 224/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 131670f..a029ee1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ fontconfig-2.14.1-r0 freetype-2.12.1-r0 gdbm-1.23-r0 git-2.38.4-r0 -glib-2.74.5-r0 +glib-2.74.6-r0 icu-data-full-72.1-r1 icu-libs-72.1-r1 jq-1.6-r2 From 792b1a8feb73ba4d7a4e3c581cc5f28967b02add Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Thu, 2 Mar 2023 00:34:26 +0000 Subject: [PATCH 225/452] Added php81-iconv as an installed php extension Adding since the iconv php extension is a requirement for BookStack that has previously been polyfilled but is now needed as an extension. Related to https://github.com/linuxserver/docker-bookstack/issues/162 --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 24f2349..0ff44dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN \ php81-curl \ php81-dom \ php81-gd \ + php81-iconv \ php81-ldap \ php81-mysqlnd \ php81-pdo_mysql \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1b5d8f7..25336d2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -24,6 +24,7 @@ RUN \ php81-curl \ php81-dom \ php81-gd \ + php81-iconv \ php81-ldap \ php81-mysqlnd \ php81-pdo_mysql \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 74760ac..e462a26 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -24,6 +24,7 @@ RUN \ php81-curl \ php81-dom \ php81-gd \ + php81-iconv \ php81-ldap \ php81-mysqlnd \ php81-pdo_mysql \ From cc131b813e40e39036e896ffaae83bd9abcafc77 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 1 Mar 2023 20:04:50 -0500 Subject: [PATCH 226/452] update changelog --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 3ab3d19..8ee1b6b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -104,6 +104,7 @@ app_setup_block: | # changelog changelogs: + - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } From c0cc940e09038a34fa4ce6f0c6fa0f81564865bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Mar 2023 02:18:18 +0100 Subject: [PATCH 227/452] Bot Updating Templated Files --- Jenkinsfile | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 972ba74..51f31fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -452,7 +452,8 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ @@ -465,7 +466,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -t ${IMAGE}:${META_TAG} \ + --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -482,7 +483,8 @@ pipeline { stage('Build X86') { steps { echo "Running on node: ${NODE_NAME}" - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ @@ -495,7 +497,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \ + --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -509,7 +511,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ @@ -522,7 +525,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \ + --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -543,7 +546,8 @@ pipeline { sh '''#! /bin/bash echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin ''' - sh "docker build \ + sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" + sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ @@ -556,7 +560,7 @@ pipeline { --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \ + --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -585,26 +589,12 @@ pipeline { else LOCAL_CONTAINER=${IMAGE}:${META_TAG} fi - if [ "${DIST_IMAGE}" == "alpine" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apk info -v > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "ubuntu" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "fedora" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - rpm -qa > /tmp/package_versions.txt && \ - sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - elif [ "${DIST_IMAGE}" == "arch" ]; then - docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\ - pacman -Q > /tmp/package_versions.txt && \ - chmod 777 /tmp/package_versions.txt' - fi + touch ${TEMPDIR}/package_versions.txt + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock:ro \ + -v ${TEMPDIR}:/tmp \ + ghcr.io/anchore/syft:latest \ + ${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" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then From 8c92c15aa633cf4eaad0be4a3a2ff58b0a3a2374 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 1 Mar 2023 19:19:47 -0600 Subject: [PATCH 228/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d13f4e8..fc2e03f 100644 --- a/README.md +++ b/README.md @@ -277,6 +277,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.03.23:** - Add php iconv. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Wrap `.env` values in quotes. * **05.01.23:** - Fix db password setting (sed escape `&`). From 99745f761f8eab0fc47d3bbbc567c0189b042b3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Mar 2023 02:23:52 +0100 Subject: [PATCH 229/452] Bot Updating Package Versions --- package_versions.txt | 395 ++++++++++++++++++++++++++++++------------- 1 file changed, 274 insertions(+), 121 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a029ee1..0d963cb 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,121 +1,274 @@ -alpine-baselayout-3.4.0-r0 -alpine-baselayout-data-3.4.0-r0 -alpine-keys-2.4-r1 -alpine-release-3.17.2-r0 -aom-libs-3.5.0-r0 -apache2-utils-2.4.55-r0 -apk-tools-2.12.10-r1 -apr-1.7.2-r0 -apr-util-1.6.3-r0 -argon2-libs-20190702-r2 -bash-5.2.15-r0 -brotli-libs-1.0.9-r9 -busybox-1.35.0-r29 -busybox-binsh-1.35.0-r29 -ca-certificates-20220614-r4 -ca-certificates-bundle-20220614-r4 -coreutils-9.1-r0 -curl-7.87.0-r2 -dbus-libs-1.14.4-r0 -encodings-1.0.6-r0 -font-freefont-20120503-r3 -fontconfig-2.14.1-r0 -freetype-2.12.1-r0 -gdbm-1.23-r0 -git-2.38.4-r0 -glib-2.74.6-r0 -icu-data-full-72.1-r1 -icu-libs-72.1-r1 -jq-1.6-r2 -libacl-2.3.1-r1 -libattr-2.5.1-r2 -libavif-0.11.1-r0 -libblkid-2.38.1-r1 -libbsd-0.11.7-r0 -libbz2-1.0.8-r4 -libc-utils-0.7.2-r3 -libcrypto3-3.0.8-r0 -libcurl-7.87.0-r2 -libdav1d-1.0.0-r2 -libedit-20221030.3.1-r0 -libevent-2.1.12-r5 -libexpat-2.5.0-r0 -libffi-3.4.4-r0 -libfontenc-1.1.6-r0 -libgcc-12.2.1_git20220924-r4 -libice-1.0.10-r1 -libintl-0.21.1-r1 -libjpeg-turbo-2.1.4-r0 -libldap-2.6.3-r6 -libmd-1.0.4-r0 -libmemcached-libs-1.0.18-r5 -libmount-2.38.1-r1 -libpcre2-16-10.42-r0 -libpng-1.6.38-r0 -libproc-3.3.17-r2 -libsasl-2.1.28-r3 -libseccomp-2.5.4-r0 -libsm-1.2.3-r1 -libssl3-3.0.8-r0 -libstdc++-12.2.1_git20220924-r4 -libuuid-2.38.1-r1 -libwebp-1.2.4-r1 -libx11-1.8.4-r0 -libxau-1.0.10-r0 -libxcb-1.15-r0 -libxdmcp-1.1.4-r0 -libxext-1.3.5-r0 -libxml2-2.10.3-r1 -libxpm-3.5.15-r0 -libxt-1.2.1-r0 -linux-pam-1.5.2-r1 -logrotate-3.20.1-r3 -memcached-1.6.17-r0 -mkfontscale-1.2.2-r1 -musl-1.2.3-r4 -musl-utils-1.2.3-r4 -nano-7.0-r0 -ncurses-libs-6.3_p20221119-r0 -ncurses-terminfo-base-6.3_p20221119-r0 -nghttp2-libs-1.51.0-r0 -nginx-1.22.1-r0 -oniguruma-6.9.8-r0 -openssl-3.0.8-r0 -pcre-8.45-r2 -pcre2-10.42-r0 -php81-8.1.16-r0 -php81-common-8.1.16-r0 -php81-ctype-8.1.16-r0 -php81-curl-8.1.16-r0 -php81-dom-8.1.16-r0 -php81-fileinfo-8.1.16-r0 -php81-fpm-8.1.16-r0 -php81-gd-8.1.16-r0 -php81-ldap-8.1.16-r0 -php81-mbstring-8.1.16-r0 -php81-mysqlnd-8.1.16-r0 -php81-openssl-8.1.16-r0 -php81-pdo-8.1.16-r0 -php81-pdo_mysql-8.1.16-r0 -php81-pecl-igbinary-3.2.12-r0 -php81-pecl-memcached-3.2.0-r0 -php81-phar-8.1.16-r0 -php81-session-8.1.16-r0 -php81-simplexml-8.1.16-r0 -php81-tokenizer-8.1.16-r0 -php81-xml-8.1.16-r0 -php81-xmlwriter-8.1.16-r0 -popt-1.19-r0 -procps-3.3.17-r2 -qt5-qtbase-5.15.6_git20221010-r0 -readline-8.2.0-r0 -scanelf-1.3.5-r1 -shadow-4.13-r0 -skalibs-2.12.0.1-r0 -ssl_client-1.35.0-r29 -tzdata-2022f-r1 -utmps-libs-0.1.2.0-r1 -xz-5.2.9-r0 -xz-libs-5.2.9-r0 -zlib-1.2.13-r0 -zstd-libs-1.5.2-r9 +NAME VERSION TYPE +alpine-baselayout 3.4.0-r0 apk +alpine-baselayout-data 3.4.0-r0 apk +alpine-keys 2.4-r1 apk +alpine-release 3.17.2-r0 apk +aom-libs 3.5.0-r0 apk +apache2-utils 2.4.55-r0 apk +apk-tools 2.12.10-r1 apk +apr 1.7.2-r0 apk +apr-util 1.6.3-r0 apk +argon2-libs 20190702-r2 apk +aws/aws-crt-php v1.0.4 php-composer +aws/aws-sdk-php 3.260.3 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.1 php-composer +bash 5.2.15-r0 apk +brick/math 0.10.2 php-composer +brotli-libs 1.0.9-r9 apk +busybox 1.35.0 binary +busybox 1.35.0-r29 apk +busybox-binsh 1.35.0-r29 apk +ca-certificates 20220614-r4 apk +ca-certificates-bundle 20220614-r4 apk +coreutils 9.1-r0 apk +curl 7.87.0-r2 apk +dasprid/enum 1.0.3 php-composer +dbus-libs 1.14.4-r0 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.6.0 php-composer +doctrine/deprecations v1.0.0 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.6 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.0 php-composer +dompdf/dompdf v2.0.3 php-composer +dragonmantank/cron-expression v3.3.2 php-composer +egulias/email-validator 3.2.5 php-composer +encodings 1.0.6-r0 apk +fakerphp/faker v1.21.0 php-composer +filp/whoops 2.14.6 php-composer +font-freefont 20120503-r3 apk +fontconfig 2.14.1-r0 apk +freetype 2.12.1-r0 apk +fruitcake/php-cors v1.2.0 php-composer +gdbm 1.23-r0 apk +git 2.38.4-r0 apk +glib 2.74.6-r0 apk +graham-campbell/result-type v1.1.0 php-composer +guzzlehttp/guzzle 7.5.0 php-composer +guzzlehttp/promises 1.5.2 php-composer +guzzlehttp/psr7 2.4.3 php-composer +guzzlehttp/uri-template v1.0.1 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +icu-data-full 72.1-r1 apk +icu-libs 72.1-r1 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.1.12 php-composer +jq 1.6-r2 apk +knplabs/knp-snappy v1.4.1 php-composer +laravel/framework v9.52.4 php-composer +laravel/serializable-closure v1.3.0 php-composer +laravel/socialite v5.6.1 php-composer +laravel/tinker v2.8.1 php-composer +league/commonmark 2.3.9 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.12.3 php-composer +league/flysystem-aws-s3-v3 3.12.2 php-composer +league/html-to-markdown 5.1.0 php-composer +league/mime-type-detection 1.11.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.6.1 php-composer +libacl 2.3.1-r1 apk +libattr 2.5.1-r2 apk +libavif 0.11.1-r0 apk +libblkid 2.38.1-r1 apk +libbsd 0.11.7-r0 apk +libbz2 1.0.8-r4 apk +libc-utils 0.7.2-r3 apk +libcrypto3 3.0.8-r0 apk +libcurl 7.87.0-r2 apk +libdav1d 1.0.0-r2 apk +libedit 20221030.3.1-r0 apk +libevent 2.1.12-r5 apk +libexpat 2.5.0-r0 apk +libffi 3.4.4-r0 apk +libfontenc 1.1.6-r0 apk +libgcc 12.2.1_git20220924-r4 apk +libice 1.0.10-r1 apk +libintl 0.21.1-r1 apk +libjpeg-turbo 2.1.4-r0 apk +libldap 2.6.3-r6 apk +libmd 1.0.4-r0 apk +libmemcached-libs 1.0.18-r5 apk +libmount 2.38.1-r1 apk +libpcre2-16 10.42-r0 apk +libpng 1.6.38-r0 apk +libproc 3.3.17-r2 apk +libsasl 2.1.28-r3 apk +libseccomp 2.5.4-r0 apk +libsm 1.2.3-r1 apk +libssl3 3.0.8-r0 apk +libstdc++ 12.2.1_git20220924-r4 apk +libuuid 2.38.1-r1 apk +libwebp 1.2.4-r1 apk +libx11 1.8.4-r0 apk +libxau 1.0.10-r0 apk +libxcb 1.15-r0 apk +libxdmcp 1.1.4-r0 apk +libxext 1.3.5-r0 apk +libxml2 2.10.3-r1 apk +libxpm 3.5.15-r0 apk +libxt 1.2.1-r0 apk +linux-pam 1.5.2-r1 apk +logrotate 3.20.1-r3 apk +masterminds/html5 2.7.6 php-composer +memcached 1.6.17 binary +memcached 1.6.17-r0 apk +mkfontscale 1.2.2-r1 apk +mockery/mockery 1.5.1 php-composer +monolog/monolog 2.9.1 php-composer +mtdowling/jmespath.php 2.6.1 php-composer +musl 1.2.3-r4 apk +musl-utils 1.2.3-r4 apk +myclabs/deep-copy 1.11.0 php-composer +nano 7.0-r0 apk +ncurses-libs 6.3_p20221119-r0 apk +ncurses-terminfo-base 6.3_p20221119-r0 apk +nesbot/carbon 2.66.0 php-composer +nette/schema v1.2.3 php-composer +nette/utils v4.0.0 php-composer +nghttp2-libs 1.51.0-r0 apk +nginx 1.22.1-r0 apk +nikic/php-parser v4.15.3 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/larastan 2.4.1 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.8-r0 apk +openssl 3.0.8-r0 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r2 apk +pcre2 10.42-r0 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.4 php-composer +phenx/php-svg-lib 0.5.0 php-composer +php-cli 8.1.16 binary +php-fpm 8.1.16 binary +php81 8.1.16-r0 apk +php81-common 8.1.16-r0 apk +php81-ctype 8.1.16-r0 apk +php81-curl 8.1.16-r0 apk +php81-dom 8.1.16-r0 apk +php81-fileinfo 8.1.16-r0 apk +php81-fpm 8.1.16-r0 apk +php81-gd 8.1.16-r0 apk +php81-iconv 8.1.16-r0 apk +php81-ldap 8.1.16-r0 apk +php81-mbstring 8.1.16-r0 apk +php81-mysqlnd 8.1.16-r0 apk +php81-openssl 8.1.16-r0 apk +php81-pdo 8.1.16-r0 apk +php81-pdo_mysql 8.1.16-r0 apk +php81-pecl-igbinary 3.2.12-r0 apk +php81-pecl-memcached 3.2.0-r0 apk +php81-phar 8.1.16-r0 apk +php81-session 8.1.16-r0 apk +php81-simplexml 8.1.16-r0 apk +php81-tokenizer 8.1.16-r0 apk +php81-xml 8.1.16-r0 apk +php81-xmlwriter 8.1.16-r0 apk +phpmyadmin/sql-parser 5.7.0 php-composer +phpoption/phpoption 1.9.0 php-composer +phpseclib/phpseclib 3.0.18 php-composer +phpstan/phpstan 1.10.3 php-composer +phpunit/php-code-coverage 9.2.25 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.3 php-composer +popt 1.19-r0 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.1.1 php-composer +procps 3.3.17-r2 apk +psr/cache 3.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.1 php-composer +psr/http-factory 1.0.1 php-composer +psr/http-message 1.0.1 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.11.12 php-composer +qt5-qtbase 5.15.6_git20221010-r0 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.3 php-composer +readline 8.2.0-r0 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser 8.4.0 php-composer +scanelf 1.3.5-r1 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.2 php-composer +sebastian/diff 4.0.4 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.5 php-composer +sebastian/lines-of-code 1.0.3 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.13-r0 apk +skalibs 2.12.0.1-r0 apk +socialiteproviders/discord 4.1.2 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.3.0 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.2.1 php-composer +socialiteproviders/slack 4.1.1 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.7.2 php-composer +ssddanbrown/asserthtml v1.0.1 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssl_client 1.35.0-r29 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mailer v6.0.19 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.27.0 php-composer +symfony/polyfill-intl-grapheme v1.27.0 php-composer +symfony/polyfill-intl-idn v1.27.0 php-composer +symfony/polyfill-intl-normalizer v1.27.0 php-composer +symfony/polyfill-mbstring v1.27.0 php-composer +symfony/polyfill-php72 v1.27.0 php-composer +symfony/polyfill-php80 v1.27.0 php-composer +symfony/polyfill-php81 v1.27.0 php-composer +symfony/polyfill-uuid v1.27.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.1 php-composer +tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +tzdata 2022f-r1 apk +utmps-libs 0.1.2.0-r1 apk +vlucas/phpdotenv v5.5.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz 5.2.9-r0 apk +xz-libs 5.2.9-r0 apk +zlib 1.2.13-r0 apk +zstd-libs 1.5.2-r9 apk From 959c9ccef98118d399822528760e16714d828c41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Mar 2023 17:00:50 +0100 Subject: [PATCH 230/452] Bot Updating Package Versions --- package_versions.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0d963cb..c73c863 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ busybox-binsh 1.35.0-r29 apk ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk coreutils 9.1-r0 apk -curl 7.87.0-r2 apk +curl 7.88.1-r0 apk dasprid/enum 1.0.3 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -79,7 +79,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r0 apk -libcurl 7.87.0-r2 apk +libcurl 7.88.1-r0 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -128,6 +128,7 @@ nano 7.0-r0 apk ncurses-libs 6.3_p20221119-r0 apk ncurses-terminfo-base 6.3_p20221119-r0 apk nesbot/carbon 2.66.0 php-composer +netcat-openbsd 1.130-r4 apk nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.51.0-r0 apk From 478a6164ba4595c3c554039152aeb48c6458de2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 9 Mar 2023 17:00:32 +0100 Subject: [PATCH 231/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c73c863..a055c5e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk alpine-release 3.17.2-r0 apk aom-libs 3.5.0-r0 apk -apache2-utils 2.4.55-r0 apk +apache2-utils 2.4.56-r0 apk apk-tools 2.12.10-r1 apk apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk @@ -45,7 +45,7 @@ fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r0 apk -git 2.38.4-r0 apk +git 2.38.4-r1 apk glib 2.74.6-r0 apk graham-campbell/result-type v1.1.0 php-composer guzzlehttp/guzzle 7.5.0 php-composer From f7bb9e3e4a231e00840687249d903c529d14614f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 23 Mar 2023 17:00:21 +0100 Subject: [PATCH 232/452] Bot Updating Package Versions --- package_versions.txt | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a055c5e..f5ab27a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ busybox-binsh 1.35.0-r29 apk ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk coreutils 9.1-r0 apk -curl 7.88.1-r0 apk +curl 7.88.1-r1 apk dasprid/enum 1.0.3 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -79,7 +79,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r0 apk -libcurl 7.88.1-r0 apk +libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -139,7 +139,7 @@ nunomaduro/larastan 2.4.1 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r0 apk -openssl 3.0.8-r0 apk +openssl 3.0.8-r1 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r2 apk @@ -148,31 +148,31 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.1.16 binary -php-fpm 8.1.16 binary -php81 8.1.16-r0 apk -php81-common 8.1.16-r0 apk -php81-ctype 8.1.16-r0 apk -php81-curl 8.1.16-r0 apk -php81-dom 8.1.16-r0 apk -php81-fileinfo 8.1.16-r0 apk -php81-fpm 8.1.16-r0 apk -php81-gd 8.1.16-r0 apk -php81-iconv 8.1.16-r0 apk -php81-ldap 8.1.16-r0 apk -php81-mbstring 8.1.16-r0 apk -php81-mysqlnd 8.1.16-r0 apk -php81-openssl 8.1.16-r0 apk -php81-pdo 8.1.16-r0 apk -php81-pdo_mysql 8.1.16-r0 apk +php-cli 8.1.17 binary +php-fpm 8.1.17 binary +php81 8.1.17-r0 apk +php81-common 8.1.17-r0 apk +php81-ctype 8.1.17-r0 apk +php81-curl 8.1.17-r0 apk +php81-dom 8.1.17-r0 apk +php81-fileinfo 8.1.17-r0 apk +php81-fpm 8.1.17-r0 apk +php81-gd 8.1.17-r0 apk +php81-iconv 8.1.17-r0 apk +php81-ldap 8.1.17-r0 apk +php81-mbstring 8.1.17-r0 apk +php81-mysqlnd 8.1.17-r0 apk +php81-openssl 8.1.17-r0 apk +php81-pdo 8.1.17-r0 apk +php81-pdo_mysql 8.1.17-r0 apk php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-memcached 3.2.0-r0 apk -php81-phar 8.1.16-r0 apk -php81-session 8.1.16-r0 apk -php81-simplexml 8.1.16-r0 apk -php81-tokenizer 8.1.16-r0 apk -php81-xml 8.1.16-r0 apk -php81-xmlwriter 8.1.16-r0 apk +php81-phar 8.1.17-r0 apk +php81-session 8.1.17-r0 apk +php81-simplexml 8.1.17-r0 apk +php81-tokenizer 8.1.17-r0 apk +php81-xml 8.1.17-r0 apk +php81-xmlwriter 8.1.17-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.0 php-composer phpseclib/phpseclib 3.0.18 php-composer From 1fae28bf6036477d73031e2c56725982c60b3e71 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 25 Mar 2023 13:38:10 +0100 Subject: [PATCH 233/452] Bot Updating Package Versions --- package_versions.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f5ab27a..5af1cd4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk argon2-libs 20190702-r2 apk aws/aws-crt-php v1.0.4 php-composer -aws/aws-sdk-php 3.260.3 php-composer +aws/aws-sdk-php 3.262.0 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.1 php-composer @@ -24,11 +24,11 @@ ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk coreutils 9.1-r0 apk curl 7.88.1-r1 apk -dasprid/enum 1.0.3 php-composer +dasprid/enum 1.0.4 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.0 php-composer +doctrine/dbal 3.6.1 php-composer doctrine/deprecations v1.0.0 php-composer doctrine/event-manager 1.2.0 php-composer doctrine/inflector 2.0.6 php-composer @@ -39,7 +39,7 @@ dragonmantank/cron-expression v3.3.2 php-composer egulias/email-validator 3.2.5 php-composer encodings 1.0.6-r0 apk fakerphp/faker v1.21.0 php-composer -filp/whoops 2.14.6 php-composer +filp/whoops 2.15.1 php-composer font-freefont 20120503-r3 apk fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk @@ -47,10 +47,10 @@ fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r0 apk git 2.38.4-r1 apk glib 2.74.6-r0 apk -graham-campbell/result-type v1.1.0 php-composer +graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.5.0 php-composer guzzlehttp/promises 1.5.2 php-composer -guzzlehttp/psr7 2.4.3 php-composer +guzzlehttp/psr7 2.4.4 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 72.1-r1 apk @@ -58,7 +58,7 @@ icu-libs 72.1-r1 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r2 apk -knplabs/knp-snappy v1.4.1 php-composer +knplabs/knp-snappy v1.4.2 php-composer laravel/framework v9.52.4 php-composer laravel/serializable-closure v1.3.0 php-composer laravel/socialite v5.6.1 php-composer @@ -123,7 +123,7 @@ monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer musl 1.2.3-r4 apk musl-utils 1.2.3-r4 apk -myclabs/deep-copy 1.11.0 php-composer +myclabs/deep-copy 1.11.1 php-composer nano 7.0-r0 apk ncurses-libs 6.3_p20221119-r0 apk ncurses-terminfo-base 6.3_p20221119-r0 apk @@ -133,9 +133,9 @@ nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.51.0-r0 apk nginx 1.22.1-r0 apk -nikic/php-parser v4.15.3 php-composer +nikic/php-parser v4.15.4 php-composer nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan 2.4.1 php-composer +nunomaduro/larastan 2.5.1 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r0 apk @@ -174,18 +174,18 @@ php81-tokenizer 8.1.17-r0 apk php81-xml 8.1.17-r0 apk php81-xmlwriter 8.1.17-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer -phpoption/phpoption 1.9.0 php-composer -phpseclib/phpseclib 3.0.18 php-composer -phpstan/phpstan 1.10.3 php-composer -phpunit/php-code-coverage 9.2.25 php-composer +phpoption/phpoption 1.9.1 php-composer +phpseclib/phpseclib 3.0.19 php-composer +phpstan/phpstan 1.10.8 php-composer +phpunit/php-code-coverage 9.2.26 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.3 php-composer +phpunit/phpunit 9.6.5 php-composer popt 1.19-r0 apk pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.1.1 php-composer +predis/predis v2.1.2 php-composer procps 3.3.17-r2 apk psr/cache 3.0.0 php-composer psr/container 2.0.2 php-composer @@ -195,7 +195,7 @@ psr/http-factory 1.0.1 php-composer psr/http-message 1.0.1 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.12 php-composer +psy/psysh v0.11.13 php-composer qt5-qtbase 5.15.6_git20221010-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer @@ -230,7 +230,7 @@ socialiteproviders/okta 4.2.1 php-composer socialiteproviders/slack 4.1.1 php-composer socialiteproviders/twitch 5.3.1 php-composer squizlabs/php_codesniffer 3.7.2 php-composer -ssddanbrown/asserthtml v1.0.1 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssl_client 1.35.0-r29 apk symfony/console v6.0.19 php-composer From b85f940dee0301d11cb9359bebd568cd14073da0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 30 Mar 2023 18:00:37 +0200 Subject: [PATCH 234/452] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5af1cd4..c020f27 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -78,7 +78,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r0 apk +libcrypto3 3.0.8-r1 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -100,7 +100,7 @@ libproc 3.3.17-r2 apk libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk -libssl3 3.0.8-r0 apk +libssl3 3.0.8-r1 apk libstdc++ 12.2.1_git20220924-r4 apk libuuid 2.38.1-r1 apk libwebp 1.2.4-r1 apk @@ -139,7 +139,7 @@ nunomaduro/larastan 2.5.1 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r0 apk -openssl 3.0.8-r1 apk +openssl 3.0.8-r3 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r2 apk @@ -264,7 +264,7 @@ symfony/uid v6.0.19 php-composer symfony/var-dumper v6.0.19 php-composer theseer/tokenizer 1.2.1 php-composer tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2022f-r1 apk +tzdata 2023b-r1 apk utmps-libs 0.1.2.0-r1 apk vlucas/phpdotenv v5.5.0 php-composer voku/portable-ascii 2.0.1 php-composer From 0f43ec9cffd0fcbb336d2dacf3ec7cc6ec07b6cc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Apr 2023 17:59:30 +0200 Subject: [PATCH 235/452] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51f31fd..0b4c26d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + 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 ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -240,17 +240,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -287,7 +284,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -304,7 +301,7 @@ pipeline { git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From 9dc39e38b83b4ae3d10aff83494e50ba773178df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Apr 2023 18:01:11 +0200 Subject: [PATCH 236/452] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100755 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c..0000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Comment on invalid interaction -on: - issues: - types: - - labeled -jobs: - add-comment-on-invalid: - if: github.event.label.name == 'invalid' - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 - secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100755 index 73dfe45..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v6.0.1 - with: - stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From fc9ae3f4157150ad1c23e434a66561dd4bafff19 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Apr 2023 11:02:44 -0500 Subject: [PATCH 237/452] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 0000000..2f54573 --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '3 9 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 6fb6d98..498d793 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '51 15 * * 4' + - cron: '4 18 * * 1' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61..1447bc5 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From b84b29044ce9418fe3830db6d6f9589d13e88ae6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 6 Apr 2023 18:05:49 +0200 Subject: [PATCH 238/452] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c020f27..54320c1 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.17.2-r0 apk +alpine-release 3.17.3-r0 apk aom-libs 3.5.0-r0 apk apache2-utils 2.4.56-r0 apk apk-tools 2.12.10-r1 apk @@ -78,7 +78,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r1 apk +libcrypto3 3.0.8-r3 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -100,7 +100,7 @@ libproc 3.3.17-r2 apk libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk -libssl3 3.0.8-r1 apk +libssl3 3.0.8-r3 apk libstdc++ 12.2.1_git20220924-r4 apk libuuid 2.38.1-r1 apk libwebp 1.2.4-r1 apk @@ -264,7 +264,7 @@ symfony/uid v6.0.19 php-composer symfony/var-dumper v6.0.19 php-composer theseer/tokenizer 1.2.1 php-composer tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2023b-r1 apk +tzdata 2023c-r0 apk utmps-libs 0.1.2.0-r1 apk vlucas/phpdotenv v5.5.0 php-composer voku/portable-ascii 2.0.1 php-composer @@ -272,4 +272,4 @@ webmozart/assert 1.11.0 php-composer xz 5.2.9-r0 apk xz-libs 5.2.9-r0 apk zlib 1.2.13-r0 apk -zstd-libs 1.5.2-r9 apk +zstd-libs 1.5.5-r0 apk From 0ffb30d5f8b0bf541e0dcd598e7cc3a6faa11ee0 Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Sat, 8 Apr 2023 22:23:46 +0100 Subject: [PATCH 239/452] Added path mapping section to readme Closes linuxserver/docker-bookstack#167 --- readme-vars.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 8ee1b6b..0b8d875 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -87,9 +87,22 @@ app_setup_block: | This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work + If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. - Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ + Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. + + ### BookStack File & Directory Paths + This container ensures certain BookStack application files & folders, such as user file upload folders, are retained within the `/config` folder so that they are persistent & accessible when the `/config` container path is bound as a volume. There may be cases, when following the BookStack documentation, that you'll need to know how these files and folders are used relative to a non-container BookStack installation. + + Below is a mapping of container `/config` paths to those relative within a BookStack install directory: + + - **/config container path** => **BookStack relative path** + - `/config/www/.env` => `.env` + - `/config/www/laravel.log` => `storage/logs/laravel.log` + - `/config/www/files/` => `storage/uploads/files/` + - `/config/www/images/` => `storage/uploads/images/` + - `/config/www/themes/` => `themes/` + - `/config/www/uploads/` => `public/uploads/` ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. From 5470eb4620eb2db51cc890ae8194b24b37c57e17 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 8 Apr 2023 23:55:56 +0200 Subject: [PATCH 240/452] Bot Updating Templated Files --- README.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc2e03f..80af1bd 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,22 @@ The default username is admin@admin.com with the password of **password**, acces This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. -If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work +If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. -Documentation for BookStack can be found at https://www.bookstackapp.com/docs/ +Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. + +### BookStack File & Directory Paths +This container ensures certain BookStack application files & folders, such as user file upload folders, are retained within the `/config` folder so that they are persistent & accessible when the `/config` container path is bound as a volume. There may be cases, when following the BookStack documentation, that you'll need to know how these files and folders are used relative to a non-container BookStack installation. + +Below is a mapping of container `/config` paths to those relative within a BookStack install directory: + +- **/config container path** => **BookStack relative path** +- `/config/www/.env` => `.env` +- `/config/www/laravel.log` => `storage/logs/laravel.log` +- `/config/www/files/` => `storage/uploads/files/` +- `/config/www/images/` => `storage/uploads/images/` +- `/config/www/themes/` => `themes/` +- `/config/www/uploads/` => `public/uploads/` ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. From d97fc18699deca48695f1f774b12b0e641c8da4e Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Thu, 13 Apr 2023 11:04:38 -0500 Subject: [PATCH 241/452] Move ssl.conf include to default.conf --- README.md | 1 + readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 80af1bd..b3797ee 100644 --- a/README.md +++ b/README.md @@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.04.23:** - Move ssl.conf include to default.conf. * **01.03.23:** - Add php iconv. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Wrap `.env` values in quotes. diff --git a/readme-vars.yml b/readme-vars.yml index 0b8d875..5064af1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -117,6 +117,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index e52e78c..3fd7d26 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; @@ -9,6 +9,8 @@ server { server_name _; + include /config/nginx/ssl.conf; + root /app/www/public; index index.html index.htm index.php; From e154cab43f42a5643f5590de962818d1f036e356 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 15 Apr 2023 17:25:09 +0200 Subject: [PATCH 242/452] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 54320c1..2e5837d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alpine-baselayout-data 3.4.0-r0 apk alpine-keys 2.4-r1 apk alpine-release 3.17.3-r0 apk aom-libs 3.5.0-r0 apk -apache2-utils 2.4.56-r0 apk +apache2-utils 2.4.57-r0 apk apk-tools 2.12.10-r1 apk apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk @@ -23,7 +23,7 @@ busybox-binsh 1.35.0-r29 apk ca-certificates 20220614-r4 apk ca-certificates-bundle 20220614-r4 apk coreutils 9.1-r0 apk -curl 7.88.1-r1 apk +curl 8.0.1-r0 apk dasprid/enum 1.0.4 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -79,7 +79,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r3 apk -libcurl 7.88.1-r1 apk +libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -109,7 +109,7 @@ libxau 1.0.10-r0 apk libxcb 1.15-r0 apk libxdmcp 1.1.4-r0 apk libxext 1.3.5-r0 apk -libxml2 2.10.3-r1 apk +libxml2 2.10.4-r0 apk libxpm 3.5.15-r0 apk libxt 1.2.1-r0 apk linux-pam 1.5.2-r1 apk @@ -148,31 +148,31 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.1.17 binary -php-fpm 8.1.17 binary -php81 8.1.17-r0 apk -php81-common 8.1.17-r0 apk -php81-ctype 8.1.17-r0 apk -php81-curl 8.1.17-r0 apk -php81-dom 8.1.17-r0 apk -php81-fileinfo 8.1.17-r0 apk -php81-fpm 8.1.17-r0 apk -php81-gd 8.1.17-r0 apk -php81-iconv 8.1.17-r0 apk -php81-ldap 8.1.17-r0 apk -php81-mbstring 8.1.17-r0 apk -php81-mysqlnd 8.1.17-r0 apk -php81-openssl 8.1.17-r0 apk -php81-pdo 8.1.17-r0 apk -php81-pdo_mysql 8.1.17-r0 apk +php-cli 8.1.18 binary +php-fpm 8.1.18 binary +php81 8.1.18-r0 apk +php81-common 8.1.18-r0 apk +php81-ctype 8.1.18-r0 apk +php81-curl 8.1.18-r0 apk +php81-dom 8.1.18-r0 apk +php81-fileinfo 8.1.18-r0 apk +php81-fpm 8.1.18-r0 apk +php81-gd 8.1.18-r0 apk +php81-iconv 8.1.18-r0 apk +php81-ldap 8.1.18-r0 apk +php81-mbstring 8.1.18-r0 apk +php81-mysqlnd 8.1.18-r0 apk +php81-openssl 8.1.18-r0 apk +php81-pdo 8.1.18-r0 apk +php81-pdo_mysql 8.1.18-r0 apk php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-memcached 3.2.0-r0 apk -php81-phar 8.1.17-r0 apk -php81-session 8.1.17-r0 apk -php81-simplexml 8.1.17-r0 apk -php81-tokenizer 8.1.17-r0 apk -php81-xml 8.1.17-r0 apk -php81-xmlwriter 8.1.17-r0 apk +php81-phar 8.1.18-r0 apk +php81-session 8.1.18-r0 apk +php81-simplexml 8.1.18-r0 apk +php81-tokenizer 8.1.18-r0 apk +php81-xml 8.1.18-r0 apk +php81-xmlwriter 8.1.18-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.19 php-composer From 1939f832f8e8bd252be73882cffbb3902e98cd4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Apr 2023 20:21:57 +0200 Subject: [PATCH 243/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2e5837d..ae5a9b9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ nunomaduro/larastan 2.5.1 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r0 apk -openssl 3.0.8-r3 apk +openssl 3.0.8-r4 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r2 apk From 1fad6afd6e4541151727b5d1c82fa4cf234ac961 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 18:19:37 +0000 Subject: [PATCH 244/452] Bot Updating Templated Files --- Jenkinsfile | 91 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0b4c26d..46e72d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,10 +42,11 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + sh '''docker pull quay.io/skopeo/stable:v1 || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -238,7 +239,7 @@ pipeline { script{ env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' + sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash docker run --rm \ -v ${WORKSPACE}:/mnt \ @@ -386,6 +387,26 @@ pipeline { } } } + // If this is a master build check the S6 service file perms + stage("Check S6 Service file Permissions"){ + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + script{ + sh '''#! /bin/bash + WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print) + if [[ -n "${WRONG_PERM}" ]]; then + echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}" + exit 1 + else + echo "S6 service file perms look good." + fi ''' + } + } + } /* ####################### GitLab Mirroring ####################### */ @@ -678,6 +699,7 @@ pipeline { ]) { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' + env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' } sh '''#! /bin/bash set -e @@ -704,8 +726,6 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e DO_REGION="ams3" \ - -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -959,8 +979,67 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \ - -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' ''' + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + } } } From 275950c67b9d6f79e5109fa3a974196fec8f55f6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 18:20:35 +0000 Subject: [PATCH 245/452] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 6 ++++-- .github/workflows/external_trigger.yml | 8 ++++++++ .../workflows/external_trigger_scheduler.yml | 18 ++++++++++-------- .github/workflows/package_trigger.yml | 4 ++++ .../workflows/package_trigger_scheduler.yml | 8 ++++---- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 87243e2..2c30784 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -2,9 +2,11 @@ name: Issue & PR Tracker on: issues: - types: [opened,reopened,labeled,unlabeled] + types: [opened,reopened,labeled,unlabeled,closed] pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] + pull_request_review: + types: [submitted,edited,dismissed] jobs: manage-project: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9338da5..3505080 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -14,9 +14,11 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER }}" ]; then echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\". ****" + echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving external version ****" EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then @@ -30,6 +32,7 @@ jobs: fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') echo "**** External version: ${EXT_RELEASE} ****" + echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY echo "**** Retrieving last pushed version ****" image="linuxserver/bookstack" tag="latest" @@ -65,14 +68,18 @@ jobs: exit 1 fi echo "**** Last pushed version: ${IMAGE_VERSION} ****" + echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + echo "Version ${EXT_RELEASE} 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 ****" + echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -82,6 +89,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 230859b..22ecbec 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: External Trigger Scheduler on: schedule: - - cron: '03 * * * *' + - cron: '19 * * * *' workflow_dispatch: jobs: @@ -17,18 +17,18 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) - if [ "$br" == "$ls_branch" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml) + ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') + ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') + if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then + echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ @@ -36,8 +36,10 @@ jobs: https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/external_trigger.yml/dispatches else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 5000ec3..d9bee33 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -14,13 +14,16 @@ jobs: run: | if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER }}" ]; then echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" + echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\". ****" + echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") @@ -30,6 +33,7 @@ jobs: buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" echo "**** Jenkins job build url: ${buildurl} ****" + echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY echo "**** Attempting to change the Jenkins job description ****" curl -iX POST \ "${buildurl}submitDescription" \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 498d793..26f3bdc 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -17,18 +17,16 @@ jobs: run: | echo "**** Branches found: ****" git for-each-ref --format='%(refname:short)' refs/remotes - echo "**** Pulling the yq docker image ****" - docker pull ghcr.io/linuxserver/yq for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) do br=$(echo "$br" | sed 's|origin/||g') echo "**** Evaluating branch ${br} ****" - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml \ - | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then echo "**** Branch ${br} appears to be live; checking workflow. ****" if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ @@ -38,9 +36,11 @@ jobs: sleep 30 else echo "**** Workflow doesn't exist; skipping trigger. ****" + echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" From 596d6d92059bb8511b18ca25f7e66a3e5b9fed95 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 May 2023 13:25:12 -0500 Subject: [PATCH 246/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ae5a9b9..64681ad 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,7 +45,7 @@ fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r0 apk -git 2.38.4-r1 apk +git 2.38.5-r0 apk glib 2.74.6-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.5.0 php-composer @@ -78,7 +78,7 @@ libblkid 2.38.1-r1 apk libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r3 apk +libcrypto3 3.0.8-r4 apk libcurl 8.0.1-r0 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk @@ -100,7 +100,7 @@ libproc 3.3.17-r2 apk libsasl 2.1.28-r3 apk libseccomp 2.5.4-r0 apk libsm 1.2.3-r1 apk -libssl3 3.0.8-r3 apk +libssl3 3.0.8-r4 apk libstdc++ 12.2.1_git20220924-r4 apk libuuid 2.38.1-r1 apk libwebp 1.2.4-r1 apk From d29c2f1f550cc3e050fecd6266f64d0022089eac Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 3 May 2023 10:32:56 +0000 Subject: [PATCH 247/452] Bot Updating Package Versions --- package_versions.txt | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 64681ad..7659093 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -9,13 +9,13 @@ apk-tools 2.12.10-r1 apk apr 1.7.2-r0 apk apr-util 1.6.3-r0 apk argon2-libs 20190702-r2 apk -aws/aws-crt-php v1.0.4 php-composer -aws/aws-sdk-php 3.262.0 php-composer +aws/aws-crt-php v1.2.1 php-composer +aws/aws-sdk-php 3.269.0 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.1 php-composer bash 5.2.15-r0 apk -brick/math 0.10.2 php-composer +brick/math 0.11.0 php-composer brotli-libs 1.0.9-r9 apk busybox 1.35.0 binary busybox 1.35.0-r29 apk @@ -28,7 +28,7 @@ dasprid/enum 1.0.4 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.1 php-composer +doctrine/dbal 3.6.2 php-composer doctrine/deprecations v1.0.0 php-composer doctrine/event-manager 1.2.0 php-composer doctrine/inflector 2.0.6 php-composer @@ -39,7 +39,7 @@ dragonmantank/cron-expression v3.3.2 php-composer egulias/email-validator 3.2.5 php-composer encodings 1.0.6-r0 apk fakerphp/faker v1.21.0 php-composer -filp/whoops 2.15.1 php-composer +filp/whoops 2.15.2 php-composer font-freefont 20120503-r3 apk fontconfig 2.14.1-r0 apk freetype 2.12.1-r0 apk @@ -48,9 +48,9 @@ gdbm 1.23-r0 apk git 2.38.5-r0 apk glib 2.74.6-r0 apk graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.5.0 php-composer +guzzlehttp/guzzle 7.5.1 php-composer guzzlehttp/promises 1.5.2 php-composer -guzzlehttp/psr7 2.4.4 php-composer +guzzlehttp/psr7 2.5.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 72.1-r1 apk @@ -59,18 +59,18 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r2 apk knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.4 php-composer +laravel/framework v9.52.7 php-composer laravel/serializable-closure v1.3.0 php-composer laravel/socialite v5.6.1 php-composer laravel/tinker v2.8.1 php-composer -league/commonmark 2.3.9 php-composer +league/commonmark 2.4.0 php-composer league/config v1.2.0 php-composer -league/flysystem 3.12.3 php-composer -league/flysystem-aws-s3-v3 3.12.2 php-composer +league/flysystem 3.14.0 php-composer +league/flysystem-aws-s3-v3 3.13.0 php-composer league/html-to-markdown 5.1.0 php-composer league/mime-type-detection 1.11.0 php-composer league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.6.1 php-composer +league/oauth2-client 2.7.0 php-composer libacl 2.3.1-r1 apk libattr 2.5.1-r2 apk libavif 0.11.1-r0 apk @@ -114,7 +114,7 @@ libxpm 3.5.15-r0 apk libxt 1.2.1-r0 apk linux-pam 1.5.2-r1 apk logrotate 3.20.1-r3 apk -masterminds/html5 2.7.6 php-composer +masterminds/html5 2.8.0 php-composer memcached 1.6.17 binary memcached 1.6.17-r0 apk mkfontscale 1.2.2-r1 apk @@ -135,7 +135,7 @@ nghttp2-libs 1.51.0-r0 apk nginx 1.22.1-r0 apk nikic/php-parser v4.15.4 php-composer nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan 2.5.1 php-composer +nunomaduro/larastan v2.6.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r0 apk @@ -176,13 +176,13 @@ php81-xmlwriter 8.1.18-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.19 php-composer -phpstan/phpstan 1.10.8 php-composer +phpstan/phpstan 1.10.14 php-composer phpunit/php-code-coverage 9.2.26 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.5 php-composer +phpunit/phpunit 9.6.7 php-composer popt 1.19-r0 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.1.2 php-composer @@ -190,16 +190,16 @@ procps 3.3.17-r2 apk psr/cache 3.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.1 php-composer -psr/http-factory 1.0.1 php-composer -psr/http-message 1.0.1 php-composer +psr/http-client 1.0.2 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.13 php-composer +psy/psysh v0.11.16 php-composer qt5-qtbase 5.15.6_git20221010-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.3 php-composer +ramsey/uuid 4.7.4 php-composer readline 8.2.0-r0 apk robrichards/xmlseclibs 3.1.1 php-composer sabberworm/php-css-parser 8.4.0 php-composer From 607fecb0bf71375d923be37b4238bd540c9b6622 Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Sat, 6 May 2023 02:20:57 +0100 Subject: [PATCH 248/452] Added requirements for bookstack-system-cli Added required ZIP extension and mariadb-client package to provide mysqldump which is required by the CLI for backing up. --- Dockerfile | 2 ++ root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ff44dd..6d2837d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,8 @@ RUN \ php81-pecl-memcached \ php81-phar \ php81-tokenizer \ + php81-zip \ + mariadb-client \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index a4da96b..1b683e6 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,7 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes} + /config/www/{uploads,files,images,themes,backups} # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -13,6 +13,7 @@ fi # create symlinks symlinks=( /app/www/themes + /app/www/storage/backups /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads From 43a36901b7519e9971444e9c6135ca802f440822 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 May 2023 15:29:11 +0000 Subject: [PATCH 249/452] Bot Updating Package Versions --- package_versions.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7659093..12ed86d 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -65,8 +65,9 @@ laravel/socialite v5.6.1 php-composer laravel/tinker v2.8.1 php-composer league/commonmark 2.4.0 php-composer league/config v1.2.0 php-composer -league/flysystem 3.14.0 php-composer -league/flysystem-aws-s3-v3 3.13.0 php-composer +league/flysystem 3.15.1 php-composer +league/flysystem-aws-s3-v3 3.15.0 php-composer +league/flysystem-local 3.15.0 php-composer league/html-to-markdown 5.1.0 php-composer league/mime-type-detection 1.11.0 php-composer league/oauth1-client v1.10.1 php-composer @@ -195,7 +196,7 @@ psr/http-factory 1.0.2 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.16 php-composer +psy/psysh v0.11.17 php-composer qt5-qtbase 5.15.6_git20221010-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer @@ -209,7 +210,7 @@ sebastian/code-unit 1.0.8 php-composer sebastian/code-unit-reverse-lookup 2.0.3 php-composer sebastian/comparator 4.0.8 php-composer sebastian/complexity 2.0.2 php-composer -sebastian/diff 4.0.4 php-composer +sebastian/diff 4.0.5 php-composer sebastian/environment 5.1.5 php-composer sebastian/exporter 4.0.5 php-composer sebastian/global-state 5.0.5 php-composer From ba204db5e64b50589e564364ce160267e34b328e Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Mon, 8 May 2023 18:29:40 +0100 Subject: [PATCH 250/452] Updated changelog and readme mapping for system-cli changes --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index 5064af1..56a12ef 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -99,6 +99,7 @@ app_setup_block: | - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` - `/config/www/laravel.log` => `storage/logs/laravel.log` + - `/config/www/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` @@ -117,6 +118,7 @@ app_setup_block: | # changelog changelogs: + - { date: "08.05.23:", desc: "Add php zip extension and mariadb-client for bookstack-system-cli support." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } From f2c4a7f002f2386536983964ff1bf3c8d30045d7 Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Mon, 8 May 2023 18:41:37 +0100 Subject: [PATCH 251/452] Updated example volume paths and url options With an aim to prevent issues when people leave them as the defaults. --- readme-vars.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 5064af1..090a393 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -26,7 +26,7 @@ param_volumes: param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} - - { env_var: "APP_URL", env_value: "", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - { env_var: "APP_URL", env_value: "<yourbaseurl>", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "<yourdbhost>", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "<yourdbport>", desc: "for specifying the database port if not default 3306" } - { env_var: "DB_USER", env_value: "<yourdbuser>", desc: "for specifying the database user" } @@ -50,14 +50,14 @@ custom_compose: | environment: - PUID=1000 - PGID=1000 - - APP_URL= + - APP_URL=https://bookstack.example.com - DB_HOST=bookstack_db - DB_PORT=3306 - DB_USER=bookstack - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp volumes: - - /path/to/data:/config + - ./app_data:/config ports: - 6875:80 restart: unless-stopped @@ -75,7 +75,7 @@ custom_compose: | - MYSQL_USER=bookstack - MYSQL_PASSWORD=<yourdbpass> volumes: - - /path/to/data:/config + - ./db_data:/config restart: unless-stopped # application setup block From e79965fd5fe9d73a2c3046f0881cbbd9b595c8fe Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Mon, 8 May 2023 19:01:05 +0100 Subject: [PATCH 252/452] Updated additional dockerfiles with cli support Also reordered packages in dockerfile to be alphabetical. --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 ++ Dockerfile.armhf | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6d2837d..22b1b26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ + mariadb-client \ memcached \ php81-ctype \ php81-curl \ @@ -32,7 +33,6 @@ RUN \ php81-phar \ php81-tokenizer \ php81-zip \ - mariadb-client \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 25336d2..b2a6def 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -19,6 +19,7 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ + mariadb-client \ memcached \ php81-ctype \ php81-curl \ @@ -31,6 +32,7 @@ RUN \ php81-pecl-memcached \ php81-phar \ php81-tokenizer \ + php81-zip \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index e462a26..68032ce 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -19,6 +19,7 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ + mariadb-client \ memcached \ php81-ctype \ php81-curl \ @@ -31,6 +32,7 @@ RUN \ php81-pecl-memcached \ php81-phar \ php81-tokenizer \ + php81-zip \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ From d94b7abffa99efe8ba24cdaa885bbd0438bd4727 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 May 2023 18:21:55 +0000 Subject: [PATCH 253/452] Bot Updating Package Versions --- package_versions.txt | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 12ed86d..3d780ef 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,8 +20,8 @@ brotli-libs 1.0.9-r9 apk busybox 1.35.0 binary busybox 1.35.0-r29 apk busybox-binsh 1.35.0-r29 apk -ca-certificates 20220614-r4 apk -ca-certificates-bundle 20220614-r4 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk coreutils 9.1-r0 apk curl 8.0.1-r0 apk dasprid/enum 1.0.4 php-composer @@ -149,31 +149,31 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.1.18 binary -php-fpm 8.1.18 binary -php81 8.1.18-r0 apk -php81-common 8.1.18-r0 apk -php81-ctype 8.1.18-r0 apk -php81-curl 8.1.18-r0 apk -php81-dom 8.1.18-r0 apk -php81-fileinfo 8.1.18-r0 apk -php81-fpm 8.1.18-r0 apk -php81-gd 8.1.18-r0 apk -php81-iconv 8.1.18-r0 apk -php81-ldap 8.1.18-r0 apk -php81-mbstring 8.1.18-r0 apk -php81-mysqlnd 8.1.18-r0 apk -php81-openssl 8.1.18-r0 apk -php81-pdo 8.1.18-r0 apk -php81-pdo_mysql 8.1.18-r0 apk +php-cli 8.1.19 binary +php-fpm 8.1.19 binary +php81 8.1.19-r0 apk +php81-common 8.1.19-r0 apk +php81-ctype 8.1.19-r0 apk +php81-curl 8.1.19-r0 apk +php81-dom 8.1.19-r0 apk +php81-fileinfo 8.1.19-r0 apk +php81-fpm 8.1.19-r0 apk +php81-gd 8.1.19-r0 apk +php81-iconv 8.1.19-r0 apk +php81-ldap 8.1.19-r0 apk +php81-mbstring 8.1.19-r0 apk +php81-mysqlnd 8.1.19-r0 apk +php81-openssl 8.1.19-r0 apk +php81-pdo 8.1.19-r0 apk +php81-pdo_mysql 8.1.19-r0 apk php81-pecl-igbinary 3.2.12-r0 apk php81-pecl-memcached 3.2.0-r0 apk -php81-phar 8.1.18-r0 apk -php81-session 8.1.18-r0 apk -php81-simplexml 8.1.18-r0 apk -php81-tokenizer 8.1.18-r0 apk -php81-xml 8.1.18-r0 apk -php81-xmlwriter 8.1.18-r0 apk +php81-phar 8.1.19-r0 apk +php81-session 8.1.19-r0 apk +php81-simplexml 8.1.19-r0 apk +php81-tokenizer 8.1.19-r0 apk +php81-xml 8.1.19-r0 apk +php81-xmlwriter 8.1.19-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.19 php-composer From 00ff6d8366cbf62fd7bced45dc1c17243d9cb874 Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Tue, 23 May 2023 12:55:59 +0100 Subject: [PATCH 254/452] Updated volume binds to include bookstack name As requested in https://github.com/linuxserver/docker-bookstack/pull/171#issuecomment-1546728941 --- readme-vars.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 090a393..4436636 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -57,7 +57,7 @@ custom_compose: | - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp volumes: - - ./app_data:/config + - ./bookstack_app_data:/config ports: - 6875:80 restart: unless-stopped @@ -75,7 +75,7 @@ custom_compose: | - MYSQL_USER=bookstack - MYSQL_PASSWORD=<yourdbpass> volumes: - - ./db_data:/config + - ./bookstack_db_data:/config restart: unless-stopped # application setup block From 5911614cd7bf888e043664eec00a7d545a6e192a Mon Sep 17 00:00:00 2001 From: Dan Brown <ssddanbrown@googlemail.com> Date: Tue, 23 May 2023 13:28:21 +0100 Subject: [PATCH 255/452] Updated changelog date for cli support --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 56a12ef..7d35c8b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -118,7 +118,7 @@ app_setup_block: | # changelog changelogs: - - { date: "08.05.23:", desc: "Add php zip extension and mariadb-client for bookstack-system-cli support." } + - { date: "23.05.23:", desc: "Add php zip extension and mariadb-client for bookstack-system-cli support." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } From 19cd312acbf8d1eed07e703cbc77d40c95ef36a6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 12:31:54 +0000 Subject: [PATCH 256/452] Bot Updating Templated Files --- Jenkinsfile | 121 ++++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 71 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46e72d8..459f827 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,12 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ - sh '''docker pull quay.io/skopeo/stable:v1 || : ''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -214,12 +219,12 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' @@ -347,6 +352,8 @@ pipeline { git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ @@ -438,8 +445,7 @@ pipeline { } steps{ sh '''#! /bin/bash - set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid' || :) if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ @@ -549,9 +555,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } stage('Build ARM64') { @@ -584,9 +593,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } } @@ -647,13 +659,6 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -671,13 +676,6 @@ pipeline { } } steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -778,17 +776,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : - if [ -n "${SEMVER}" ]; then - docker rmi ${DELETEIMAGE}:${SEMVER} || : - fi - done - ''' } } } @@ -882,29 +869,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - if [ -n "${SEMVER}" ]; then - docker rmi \ - ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : - fi - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' } } } @@ -975,7 +939,6 @@ pipeline { stage('Pull Request Comment') { when { not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' environment name: 'EXIT_STATUS', value: '' } steps { @@ -1029,16 +992,24 @@ pipeline { echo "$escaped_table" } - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' } } @@ -1065,6 +1036,14 @@ pipeline { } } cleanup { + sh '''#! /bin/bash + echo "Performing docker system prune!!" + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : + ''' cleanWs() } } From 5b2e8ecaa01e0122947dd7cbf42f1bd0f30491ca Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 12:33:25 +0000 Subject: [PATCH 257/452] Bot Updating Templated Files --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b3797ee..dad74ef 100644 --- a/README.md +++ b/README.md @@ -112,14 +112,14 @@ services: environment: - PUID=1000 - PGID=1000 - - APP_URL= + - APP_URL=https://bookstack.example.com - DB_HOST=bookstack_db - DB_PORT=3306 - DB_USER=bookstack - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp volumes: - - /path/to/data:/config + - ./bookstack_app_data:/config ports: - 6875:80 restart: unless-stopped @@ -137,7 +137,7 @@ services: - MYSQL_USER=bookstack - MYSQL_PASSWORD=<yourdbpass> volumes: - - /path/to/data:/config + - ./bookstack_db_data:/config restart: unless-stopped ``` @@ -150,7 +150,7 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ - -e APP_URL= \ + -e APP_URL=<yourbaseurl> \ -e DB_HOST=<yourdbhost> \ -e DB_PORT=<yourdbport> \ -e DB_USER=<yourdbuser> \ @@ -173,7 +173,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e APP_URL=` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | +| `-e APP_URL=<yourbaseurl>` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | | `-e DB_USER=<yourdbuser>` | for specifying the database user | From ff037f40a167d6043822e12a0447ff4c293b37c4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 23 May 2023 12:37:43 +0000 Subject: [PATCH 258/452] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3d780ef..fed640c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -13,7 +13,7 @@ aws/aws-crt-php v1.2.1 php-composer aws/aws-sdk-php 3.269.0 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer bash 5.2.15-r0 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r9 apk @@ -38,7 +38,7 @@ dompdf/dompdf v2.0.3 php-composer dragonmantank/cron-expression v3.3.2 php-composer egulias/email-validator 3.2.5 php-composer encodings 1.0.6-r0 apk -fakerphp/faker v1.21.0 php-composer +fakerphp/faker v1.22.0 php-composer filp/whoops 2.15.2 php-composer font-freefont 20120503-r3 apk fontconfig 2.14.1-r0 apk @@ -48,8 +48,8 @@ gdbm 1.23-r0 apk git 2.38.5-r0 apk glib 2.74.6-r0 apk graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.5.1 php-composer -guzzlehttp/promises 1.5.2 php-composer +guzzlehttp/guzzle 7.7.0 php-composer +guzzlehttp/promises 1.5.3 php-composer guzzlehttp/psr7 2.5.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer @@ -134,7 +134,7 @@ nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.51.0-r0 apk nginx 1.22.1-r0 apk -nikic/php-parser v4.15.4 php-composer +nikic/php-parser v4.15.5 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/larastan v2.6.0 php-composer nunomaduro/termwind v1.15.1 php-composer @@ -177,13 +177,13 @@ php81-xmlwriter 8.1.19-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.19 php-composer -phpstan/phpstan 1.10.14 php-composer +phpstan/phpstan 1.10.15 php-composer phpunit/php-code-coverage 9.2.26 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.7 php-composer +phpunit/phpunit 9.6.8 php-composer popt 1.19-r0 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.1.2 php-composer From f6fc0ac4b0651af02665773808b4b84b6bd56055 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Thu, 25 May 2023 22:10:38 -0500 Subject: [PATCH 259/452] Rebase to Alpine 3.18, deprecate armhf --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - Dockerfile | 36 +++++-------- Dockerfile.aarch64 | 36 +++++-------- Dockerfile.armhf | 67 ------------------------ Jenkinsfile | 78 ++++++---------------------- README.md | 3 +- jenkins-vars.yml | 1 + readme-vars.yml | 2 +- 8 files changed, 49 insertions(+), 175 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 59a10f5..ce3d19a 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -53,7 +53,6 @@ body: options: - x86-64 - arm64 - - armhf validations: required: true - type: textarea diff --git a/Dockerfile b/Dockerfile index 0ff44dd..c90d704 100644 --- a/Dockerfile +++ b/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 @@ -13,30 +13,23 @@ LABEL maintainer="homerr" 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 \ 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 \ + 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 && \ @@ -53,11 +46,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/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 25336d2..38c010c 100644 --- a/Dockerfile.aarch64 +++ b/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 @@ -13,30 +13,23 @@ LABEL maintainer="homerr" 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 \ 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 \ + 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 && \ @@ -53,11 +46,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/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index e462a26..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,67 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17 - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG BOOKSTACK_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="homerr" - -# 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 \ - 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 \ - 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 && \ - echo "**** fetch bookstack ****" && \ - mkdir -p\ - /app/www && \ - if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ - BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/bookstack.tar.gz -L \ - "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/bookstack.tar.gz -C \ - /app/www/ --strip-components=1 && \ - echo "**** install composer dependencies ****" && \ - composer install -d /app/www/ && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.composer \ - /tmp/* - -# copy local files -COPY root/ / - -# ports and volumes -EXPOSE 80 443 -VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 459f827..7599ede 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -173,7 +173,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -196,7 +196,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -219,7 +219,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } @@ -525,44 +525,6 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''#! /bin/bash - containers=$(docker ps -aq) - if [[ -n "${containers}" ]]; then - docker stop ${containers} - fi - docker system prune -af --volumes || : ''' - } - } stage('Build ARM64') { agent { label 'ARM64' @@ -703,9 +665,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -808,8 +768,6 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi @@ -817,49 +775,47 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 if [ -n "${SEMVER}" ]; then docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi + token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} diff --git a/README.md b/README.md index dad74ef..8c53fa0 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ✅ | arm32v7-\<version tag\> | +| armhf | ❌ | | ## Application Setup @@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **13.04.23:** - Move ssl.conf include to default.conf. * **01.03.23:** - Add php iconv. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 69a2c9c..4a8571c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,6 +6,7 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master +build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'bookstackapp' diff --git a/readme-vars.yml b/readme-vars.yml index 4436636..e940c80 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,7 +16,6 @@ project_blurb: | available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # container parameters param_container_name: "{{ project_name }}" @@ -117,6 +116,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } From 769680eff86f0f6d41a6eef5ac0defd89ba7ed04 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 May 2023 18:20:05 +0000 Subject: [PATCH 260/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fed640c..3c5a046 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ busybox-binsh 1.35.0-r29 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.1-r0 apk -curl 8.0.1-r0 apk +curl 8.1.0-r1 apk dasprid/enum 1.0.4 php-composer dbus-libs 1.14.4-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -46,7 +46,7 @@ freetype 2.12.1-r0 apk fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r0 apk git 2.38.5-r0 apk -glib 2.74.6-r0 apk +glib 2.74.7-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.7.0 php-composer guzzlehttp/promises 1.5.3 php-composer @@ -80,7 +80,7 @@ libbsd 0.11.7-r0 apk libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcrypto3 3.0.8-r4 apk -libcurl 8.0.1-r0 apk +libcurl 8.1.0-r1 apk libdav1d 1.0.0-r2 apk libedit 20221030.3.1-r0 apk libevent 2.1.12-r5 apk @@ -104,7 +104,7 @@ libsm 1.2.3-r1 apk libssl3 3.0.8-r4 apk libstdc++ 12.2.1_git20220924-r4 apk libuuid 2.38.1-r1 apk -libwebp 1.2.4-r1 apk +libwebp 1.2.4-r2 apk libx11 1.8.4-r0 apk libxau 1.0.10-r0 apk libxcb 1.15-r0 apk @@ -122,8 +122,8 @@ mkfontscale 1.2.2-r1 apk mockery/mockery 1.5.1 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer -musl 1.2.3-r4 apk -musl-utils 1.2.3-r4 apk +musl 1.2.3-r5 apk +musl-utils 1.2.3-r5 apk myclabs/deep-copy 1.11.1 php-composer nano 7.0-r0 apk ncurses-libs 6.3_p20221119-r0 apk From 40692d2a9f98cb08be877414cdf66dbe7db02f3b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 30 May 2023 13:58:16 +0000 Subject: [PATCH 261/452] Bot Updating Package Versions --- package_versions.txt | 557 ++++++++++++++++++++++--------------------- 1 file changed, 281 insertions(+), 276 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3c5a046..8e18247 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,276 +1,281 @@ -NAME VERSION TYPE -alpine-baselayout 3.4.0-r0 apk -alpine-baselayout-data 3.4.0-r0 apk -alpine-keys 2.4-r1 apk -alpine-release 3.17.3-r0 apk -aom-libs 3.5.0-r0 apk -apache2-utils 2.4.57-r0 apk -apk-tools 2.12.10-r1 apk -apr 1.7.2-r0 apk -apr-util 1.6.3-r0 apk -argon2-libs 20190702-r2 apk -aws/aws-crt-php v1.2.1 php-composer -aws/aws-sdk-php 3.269.0 php-composer -bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.15-r0 apk -brick/math 0.11.0 php-composer -brotli-libs 1.0.9-r9 apk -busybox 1.35.0 binary -busybox 1.35.0-r29 apk -busybox-binsh 1.35.0-r29 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -coreutils 9.1-r0 apk -curl 8.1.0-r1 apk -dasprid/enum 1.0.4 php-composer -dbus-libs 1.14.4-r0 apk -dflydev/dot-access-data v3.0.2 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.2 php-composer -doctrine/deprecations v1.0.0 php-composer -doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.6 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.0 php-composer -dompdf/dompdf v2.0.3 php-composer -dragonmantank/cron-expression v3.3.2 php-composer -egulias/email-validator 3.2.5 php-composer -encodings 1.0.6-r0 apk -fakerphp/faker v1.22.0 php-composer -filp/whoops 2.15.2 php-composer -font-freefont 20120503-r3 apk -fontconfig 2.14.1-r0 apk -freetype 2.12.1-r0 apk -fruitcake/php-cors v1.2.0 php-composer -gdbm 1.23-r0 apk -git 2.38.5-r0 apk -glib 2.74.7-r0 apk -graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.7.0 php-composer -guzzlehttp/promises 1.5.3 php-composer -guzzlehttp/psr7 2.5.0 php-composer -guzzlehttp/uri-template v1.0.1 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 72.1-r1 apk -icu-libs 72.1-r1 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r2 apk -knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.7 php-composer -laravel/serializable-closure v1.3.0 php-composer -laravel/socialite v5.6.1 php-composer -laravel/tinker v2.8.1 php-composer -league/commonmark 2.4.0 php-composer -league/config v1.2.0 php-composer -league/flysystem 3.15.1 php-composer -league/flysystem-aws-s3-v3 3.15.0 php-composer -league/flysystem-local 3.15.0 php-composer -league/html-to-markdown 5.1.0 php-composer -league/mime-type-detection 1.11.0 php-composer -league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r1 apk -libattr 2.5.1-r2 apk -libavif 0.11.1-r0 apk -libblkid 2.38.1-r1 apk -libbsd 0.11.7-r0 apk -libbz2 1.0.8-r4 apk -libc-utils 0.7.2-r3 apk -libcrypto3 3.0.8-r4 apk -libcurl 8.1.0-r1 apk -libdav1d 1.0.0-r2 apk -libedit 20221030.3.1-r0 apk -libevent 2.1.12-r5 apk -libexpat 2.5.0-r0 apk -libffi 3.4.4-r0 apk -libfontenc 1.1.6-r0 apk -libgcc 12.2.1_git20220924-r4 apk -libice 1.0.10-r1 apk -libintl 0.21.1-r1 apk -libjpeg-turbo 2.1.4-r0 apk -libldap 2.6.3-r6 apk -libmd 1.0.4-r0 apk -libmemcached-libs 1.0.18-r5 apk -libmount 2.38.1-r1 apk -libpcre2-16 10.42-r0 apk -libpng 1.6.38-r0 apk -libproc 3.3.17-r2 apk -libsasl 2.1.28-r3 apk -libseccomp 2.5.4-r0 apk -libsm 1.2.3-r1 apk -libssl3 3.0.8-r4 apk -libstdc++ 12.2.1_git20220924-r4 apk -libuuid 2.38.1-r1 apk -libwebp 1.2.4-r2 apk -libx11 1.8.4-r0 apk -libxau 1.0.10-r0 apk -libxcb 1.15-r0 apk -libxdmcp 1.1.4-r0 apk -libxext 1.3.5-r0 apk -libxml2 2.10.4-r0 apk -libxpm 3.5.15-r0 apk -libxt 1.2.1-r0 apk -linux-pam 1.5.2-r1 apk -logrotate 3.20.1-r3 apk -masterminds/html5 2.8.0 php-composer -memcached 1.6.17 binary -memcached 1.6.17-r0 apk -mkfontscale 1.2.2-r1 apk -mockery/mockery 1.5.1 php-composer -monolog/monolog 2.9.1 php-composer -mtdowling/jmespath.php 2.6.1 php-composer -musl 1.2.3-r5 apk -musl-utils 1.2.3-r5 apk -myclabs/deep-copy 1.11.1 php-composer -nano 7.0-r0 apk -ncurses-libs 6.3_p20221119-r0 apk -ncurses-terminfo-base 6.3_p20221119-r0 apk -nesbot/carbon 2.66.0 php-composer -netcat-openbsd 1.130-r4 apk -nette/schema v1.2.3 php-composer -nette/utils v4.0.0 php-composer -nghttp2-libs 1.51.0-r0 apk -nginx 1.22.1-r0 apk -nikic/php-parser v4.15.5 php-composer -nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.0 php-composer -nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.8-r0 apk -openssl 3.0.8-r4 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r2 apk -pcre2 10.42-r0 apk -phar-io/manifest 2.0.3 php-composer -phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.4 php-composer -phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.1.19 binary -php-fpm 8.1.19 binary -php81 8.1.19-r0 apk -php81-common 8.1.19-r0 apk -php81-ctype 8.1.19-r0 apk -php81-curl 8.1.19-r0 apk -php81-dom 8.1.19-r0 apk -php81-fileinfo 8.1.19-r0 apk -php81-fpm 8.1.19-r0 apk -php81-gd 8.1.19-r0 apk -php81-iconv 8.1.19-r0 apk -php81-ldap 8.1.19-r0 apk -php81-mbstring 8.1.19-r0 apk -php81-mysqlnd 8.1.19-r0 apk -php81-openssl 8.1.19-r0 apk -php81-pdo 8.1.19-r0 apk -php81-pdo_mysql 8.1.19-r0 apk -php81-pecl-igbinary 3.2.12-r0 apk -php81-pecl-memcached 3.2.0-r0 apk -php81-phar 8.1.19-r0 apk -php81-session 8.1.19-r0 apk -php81-simplexml 8.1.19-r0 apk -php81-tokenizer 8.1.19-r0 apk -php81-xml 8.1.19-r0 apk -php81-xmlwriter 8.1.19-r0 apk -phpmyadmin/sql-parser 5.7.0 php-composer -phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.19 php-composer -phpstan/phpstan 1.10.15 php-composer -phpunit/php-code-coverage 9.2.26 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.8 php-composer -popt 1.19-r0 apk -pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.1.2 php-composer -procps 3.3.17-r2 apk -psr/cache 3.0.0 php-composer -psr/container 2.0.2 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.2 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer -psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.17 php-composer -qt5-qtbase 5.15.6_git20221010-r0 apk -ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.4 php-composer -readline 8.2.0-r0 apk -robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser 8.4.0 php-composer -scanelf 1.3.5-r1 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.2 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.5 php-composer -sebastian/lines-of-code 1.0.3 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer -shadow 4.13-r0 apk -skalibs 2.12.0.1-r0 apk -socialiteproviders/discord 4.1.2 php-composer -socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.3.0 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.2.1 php-composer -socialiteproviders/slack 4.1.1 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.7.2 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssl_client 1.35.0-r29 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mailer v6.0.19 php-composer -symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.27.0 php-composer -symfony/polyfill-intl-grapheme v1.27.0 php-composer -symfony/polyfill-intl-idn v1.27.0 php-composer -symfony/polyfill-intl-normalizer v1.27.0 php-composer -symfony/polyfill-mbstring v1.27.0 php-composer -symfony/polyfill-php72 v1.27.0 php-composer -symfony/polyfill-php80 v1.27.0 php-composer -symfony/polyfill-php81 v1.27.0 php-composer -symfony/polyfill-uuid v1.27.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.1 php-composer -tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2023c-r0 apk -utmps-libs 0.1.2.0-r1 apk -vlucas/phpdotenv v5.5.0 php-composer -voku/portable-ascii 2.0.1 php-composer -webmozart/assert 1.11.0 php-composer -xz 5.2.9-r0 apk -xz-libs 5.2.9-r0 apk -zlib 1.2.13-r0 apk -zstd-libs 1.5.5-r0 apk +NAME VERSION TYPE +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.0-r0 apk +aom-libs 3.6.1-r0 apk +apache2-utils 2.4.57-r2 apk +apk-tools 2.14.0-r2 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r4 apk +aws/aws-crt-php v1.2.1 php-composer +aws/aws-sdk-php 3.269.0 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer +bash 5.2.15-r5 apk +brick/math 0.11.0 php-composer +brotli-libs 1.0.9-r14 apk +busybox 1.36.0 binary +busybox 1.36.0-r9 apk +busybox-binsh 1.36.0-r9 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +coreutils 9.3-r1 apk +curl 8.1.1-r1 apk +dasprid/enum 1.0.4 php-composer +dbus-libs 1.14.6-r3 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.6.2 php-composer +doctrine/deprecations v1.0.0 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.6 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.0 php-composer +dompdf/dompdf v2.0.3 php-composer +dragonmantank/cron-expression v3.3.2 php-composer +egulias/email-validator 3.2.5 php-composer +encodings 1.0.7-r1 apk +fakerphp/faker v1.22.0 php-composer +filp/whoops 2.15.2 php-composer +font-freefont 20120503-r4 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fruitcake/php-cors v1.2.0 php-composer +gdbm 1.23-r1 apk +git 2.40.1-r0 apk +glib 2.76.3-r0 apk +graham-campbell/result-type v1.1.1 php-composer +guzzlehttp/guzzle 7.7.0 php-composer +guzzlehttp/promises 1.5.3 php-composer +guzzlehttp/psr7 2.5.0 php-composer +guzzlehttp/uri-template v1.0.1 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +icu-data-full 73.1-r1 apk +icu-libs 73.1-r1 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.1.12 php-composer +jq 1.6-r3 apk +knplabs/knp-snappy v1.4.2 php-composer +laravel/framework v9.52.7 php-composer +laravel/serializable-closure v1.3.0 php-composer +laravel/socialite v5.6.1 php-composer +laravel/tinker v2.8.1 php-composer +league/commonmark 2.4.0 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.15.1 php-composer +league/flysystem-aws-s3-v3 3.15.0 php-composer +league/flysystem-local 3.15.0 php-composer +league/html-to-markdown 5.1.0 php-composer +league/mime-type-detection 1.11.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.7.0 php-composer +libacl 2.3.1-r3 apk +libattr 2.5.1-r4 apk +libavif 0.11.1-r2 apk +libblkid 2.38.1-r7 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.0-r4 apk +libcurl 8.1.1-r1 apk +libdav1d 1.2.0-r0 apk +libedit 20221030.3.1-r1 apk +libevent 2.1.12-r6 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libfontenc 1.1.7-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libice 1.1.1-r2 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r2 apk +libldap 2.6.4-r3 apk +libmd 1.0.4-r2 apk +libmemcached-libs 1.1.4-r1 apk +libmount 2.38.1-r7 apk +libncursesw 6.4_p20230506-r0 apk +libpcre2-16 10.42-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.3-r1 apk +libsasl 2.1.28-r4 apk +libseccomp 2.5.4-r2 apk +libsm 1.2.4-r1 apk +libssl3 3.1.0-r4 apk +libstdc++ 12.2.1_git20220924-r10 apk +libunistring 1.1-r1 apk +libuuid 2.38.1-r7 apk +libwebp 1.3.0-r2 apk +libx11 1.8.4-r3 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxml2 2.11.4-r0 apk +libxpm 3.5.16-r1 apk +libxt 1.3.0-r2 apk +libzip 1.9.2-r2 apk +linux-pam 1.5.2-r10 apk +logrotate 3.21.0-r1 apk +masterminds/html5 2.8.0 php-composer +memcached 1.6.20 binary +memcached 1.6.20-r0 apk +mkfontscale 1.2.2-r3 apk +mockery/mockery 1.5.1 php-composer +monolog/monolog 2.9.1 php-composer +mtdowling/jmespath.php 2.6.1 php-composer +musl 1.2.4-r0 apk +musl-utils 1.2.4-r0 apk +myclabs/deep-copy 1.11.1 php-composer +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +nesbot/carbon 2.66.0 php-composer +netcat-openbsd 1.219-r1 apk +nette/schema v1.2.3 php-composer +nette/utils v4.0.0 php-composer +nghttp2-libs 1.53.0-r0 apk +nginx 1.24.0-r6 apk +nikic/php-parser v4.15.5 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/larastan v2.6.0 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.8-r1 apk +openssl 3.1.0-r4 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r1 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.4 php-composer +phenx/php-svg-lib 0.5.0 php-composer +php-cli 8.2.6 binary +php-fpm 8.2.6 binary +php82 8.2.6-r1 apk +php82-common 8.2.6-r1 apk +php82-ctype 8.2.6-r1 apk +php82-curl 8.2.6-r1 apk +php82-dom 8.2.6-r1 apk +php82-fileinfo 8.2.6-r1 apk +php82-fpm 8.2.6-r1 apk +php82-gd 8.2.6-r1 apk +php82-iconv 8.2.6-r1 apk +php82-ldap 8.2.6-r1 apk +php82-mbstring 8.2.6-r1 apk +php82-mysqlnd 8.2.6-r1 apk +php82-openssl 8.2.6-r1 apk +php82-pdo 8.2.6-r1 apk +php82-pdo_mysql 8.2.6-r1 apk +php82-pecl-igbinary 3.2.14-r0 apk +php82-pecl-memcached 3.2.0-r1 apk +php82-pecl-msgpack 2.2.0_rc2-r1 apk +php82-phar 8.2.6-r1 apk +php82-session 8.2.6-r1 apk +php82-simplexml 8.2.6-r1 apk +php82-sockets 8.2.6-r1 apk +php82-tokenizer 8.2.6-r1 apk +php82-xml 8.2.6-r1 apk +php82-xmlwriter 8.2.6-r1 apk +php82-zip 8.2.6-r1 apk +phpmyadmin/sql-parser 5.7.0 php-composer +phpoption/phpoption 1.9.1 php-composer +phpseclib/phpseclib 3.0.19 php-composer +phpstan/phpstan 1.10.15 php-composer +phpunit/php-code-coverage 9.2.26 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.8 php-composer +popt 1.19-r2 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.1.2 php-composer +procps-ng 4.0.3-r1 apk +psr/cache 3.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.2 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.11.17 php-composer +qt5-qtbase 5.15.9_git20230505-r0 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.4 php-composer +readline 8.2.1-r1 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser 8.4.0 php-composer +scanelf 1.3.7-r1 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.2 php-composer +sebastian/diff 4.0.5 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.5 php-composer +sebastian/lines-of-code 1.0.3 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.13-r2 apk +skalibs 2.13.1.1-r1 apk +socialiteproviders/discord 4.1.2 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.3.0 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.2.1 php-composer +socialiteproviders/slack 4.1.1 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.7.2 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssl_client 1.36.0-r9 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mailer v6.0.19 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.27.0 php-composer +symfony/polyfill-intl-grapheme v1.27.0 php-composer +symfony/polyfill-intl-idn v1.27.0 php-composer +symfony/polyfill-intl-normalizer v1.27.0 php-composer +symfony/polyfill-mbstring v1.27.0 php-composer +symfony/polyfill-php72 v1.27.0 php-composer +symfony/polyfill-php80 v1.27.0 php-composer +symfony/polyfill-php81 v1.27.0 php-composer +symfony/polyfill-uuid v1.27.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.1 php-composer +tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +vlucas/phpdotenv v5.5.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz-libs 5.4.3-r0 apk +zlib 1.2.13-r1 apk +zstd-libs 1.5.5-r4 apk From d5a2d9e57c9986d4c164c69ee2a205761c8e0712 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Jun 2023 18:21:35 +0000 Subject: [PATCH 262/452] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8e18247..25d3bd2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,9 +79,9 @@ libblkid 2.38.1-r7 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.0-r4 apk +libcrypto3 3.1.1-r1 apk libcurl 8.1.1-r1 apk -libdav1d 1.2.0-r0 apk +libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk libexpat 2.5.0-r1 apk @@ -103,7 +103,7 @@ libproc2 4.0.3-r1 apk libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.0-r4 apk +libssl3 3.1.1-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r7 apk @@ -143,7 +143,7 @@ nunomaduro/larastan v2.6.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.0-r4 apk +openssl 3.1.1-r1 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -171,7 +171,7 @@ php82-pdo 8.2.6-r1 apk php82-pdo_mysql 8.2.6-r1 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk -php82-pecl-msgpack 2.2.0_rc2-r1 apk +php82-pecl-msgpack 2.2.0-r0 apk php82-phar 8.2.6-r1 apk php82-session 8.2.6-r1 apk php82-simplexml 8.2.6-r1 apk From eb7bd9a62619ca5a14652602d756bc06cf28d4dc Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Wed, 7 Jun 2023 13:39:51 +0100 Subject: [PATCH 263/452] Rebase against current master branch --- .github/ISSUE_TEMPLATE/issue.bug.yml | 1 - Dockerfile | 39 +++--- Dockerfile.aarch64 | 39 +++--- Dockerfile.armhf | 69 ---------- Jenkinsfile | 185 +++++++++------------------ README.md | 5 +- jenkins-vars.yml | 1 + readme-vars.yml | 4 +- 8 files changed, 97 insertions(+), 246 deletions(-) delete mode 100644 Dockerfile.armhf diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 59a10f5..ce3d19a 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -53,7 +53,6 @@ body: options: - x86-64 - arm64 - - armhf validations: required: true - type: textarea diff --git a/Dockerfile b/Dockerfile index 22b1b26..7ef3d58 100644 --- a/Dockerfile +++ b/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/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b2a6def..f93873c 100644 --- a/Dockerfile.aarch64 +++ b/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/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 68032ce..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,69 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17 - -# set version label -ARG BUILD_DATE -ARG VERSION -ARG BOOKSTACK_RELEASE -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="homerr" - -# 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 \ - 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 && \ - echo "**** fetch bookstack ****" && \ - mkdir -p\ - /app/www && \ - if [ -z ${BOOKSTACK_RELEASE+x} ]; then \ - BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ - fi && \ - curl -o \ - /tmp/bookstack.tar.gz -L \ - "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \ - tar xf \ - /tmp/bookstack.tar.gz -C \ - /app/www/ --strip-components=1 && \ - echo "**** install composer dependencies ****" && \ - composer install -d /app/www/ && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.composer \ - /tmp/* - -# copy local files -COPY root/ / - -# ports and volumes -EXPOSE 80 443 -VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 46e72d8..7599ede 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,12 @@ pipeline { // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ - sh '''docker pull quay.io/skopeo/stable:v1 || : ''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -168,7 +173,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -191,7 +196,7 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } @@ -214,12 +219,12 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST - env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' @@ -347,6 +352,8 @@ pipeline { git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ @@ -438,8 +445,7 @@ pipeline { } steps{ sh '''#! /bin/bash - set -e - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid') + PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid' || :) if [ -z "${PACKAGE_UUID}" ]; then echo "Adding package to Scarf.sh" curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ @@ -519,41 +525,6 @@ pipeline { --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } - stage('Build ARMHF') { - agent { - label 'ARMHF' - } - steps { - echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' - sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-bookstack/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-bookstack\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-bookstack\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Bookstack\" \ - --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ - --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}" - } - sh '''docker rmi \ - ${IMAGE}:arm32v7-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :''' - } - } stage('Build ARM64') { agent { label 'ARM64' @@ -584,9 +555,12 @@ pipeline { retry(5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } - sh '''docker rmi \ - ${IMAGE}:arm64v8-${META_TAG} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' + sh '''#! /bin/bash + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : ''' } } } @@ -647,13 +621,6 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - sh '''#! /bin/bash - echo "Packages were updated. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -671,13 +638,6 @@ pipeline { } } steps { - sh '''#! /bin/bash - echo "There are no package updates. Cleaning up the image and exiting." - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then - docker rmi ${IMAGE}:amd64-${META_TAG} - else - docker rmi ${IMAGE}:${META_TAG} - fi''' script{ env.EXIT_STATUS = 'ABORTED' } @@ -705,9 +665,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -778,17 +736,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:latest || : - if [ -n "${SEMVER}" ]; then - docker rmi ${DELETEIMAGE}:${SEMVER} || : - fi - done - ''' } } } @@ -821,8 +768,6 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi @@ -830,49 +775,47 @@ pipeline { docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker push ${MANIFESTIMAGE}:amd64-${META_TAG} docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG} - docker push ${MANIFESTIMAGE}:arm32v7-latest - docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker push ${MANIFESTIMAGE}:arm64v8-latest docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 if [ -n "${SEMVER}" ]; then docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm + docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 fi + token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest") + if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : + docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest + docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest + fi docker manifest push --purge ${MANIFESTIMAGE}:latest docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} @@ -882,29 +825,6 @@ pipeline { done ''' } - sh '''#! /bin/bash - for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker rmi \ - ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ - ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ - ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \ - ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest \ - ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || : - if [ -n "${SEMVER}" ]; then - docker rmi \ - ${DELETEIMAGE}:amd64-${SEMVER} \ - ${DELETEIMAGE}:arm32v7-${SEMVER} \ - ${DELETEIMAGE}:arm64v8-${SEMVER} || : - fi - done - docker rmi \ - ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ - ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || : - ''' } } } @@ -975,7 +895,6 @@ pipeline { stage('Pull Request Comment') { when { not {environment name: 'CHANGE_ID', value: ''} - environment name: 'CI', value: 'true' environment name: 'EXIT_STATUS', value: '' } steps { @@ -1029,16 +948,24 @@ pipeline { echo "$escaped_table" } - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"''' + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' } } @@ -1065,6 +992,14 @@ pipeline { } } cleanup { + sh '''#! /bin/bash + echo "Performing docker system prune!!" + containers=$(docker ps -aq) + if [[ -n "${containers}" ]]; then + docker stop ${containers} + fi + docker system prune -af --volumes || : + ''' cleanWs() } } diff --git a/README.md b/README.md index b3797ee..a48ecb8 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\<version tag\> | | arm64 | ✅ | arm64v8-\<version tag\> | -| armhf | ✅ | arm32v7-\<version tag\> | +| armhf | ❌ | | ## Application Setup @@ -81,6 +81,7 @@ Below is a mapping of container `/config` paths to those relative within a BookS - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` - `/config/www/laravel.log` => `storage/logs/laravel.log` +- `/config/www/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` @@ -290,6 +291,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.06.23:** - Add mariadb-client for bookstack-system-cli support. +* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **13.04.23:** - Move ssl.conf include to default.conf. * **01.03.23:** - Add php iconv. * **19.01.23:** - Rebase to alpine 3.17 with php8.1. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 69a2c9c..4a8571c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,6 +6,7 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master +build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'bookstackapp' diff --git a/readme-vars.yml b/readme-vars.yml index 7d35c8b..8a65369 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,7 +16,6 @@ project_blurb: | available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # container parameters param_container_name: "{{ project_name }}" @@ -118,7 +117,8 @@ app_setup_block: | # changelog changelogs: - - { date: "23.05.23:", desc: "Add php zip extension and mariadb-client for bookstack-system-cli support." } + - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } + - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } From b4f199a7c5827b81ce74bd99c97d0bc5c905411e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 9 Jun 2023 12:47:10 +0000 Subject: [PATCH 264/452] Bot Updating Package Versions --- package_versions.txt | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 25d3bd2..d393df9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,15 +17,15 @@ barryvdh/laravel-snappy v1.0.2 php-composer bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk -busybox 1.36.0 binary -busybox 1.36.0-r9 apk -busybox-binsh 1.36.0-r9 apk +busybox 1.36.1 binary +busybox 1.36.1-r0 apk +busybox-binsh 1.36.1-r0 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk -curl 8.1.1-r1 apk +curl 8.1.2-r0 apk dasprid/enum 1.0.4 php-composer -dbus-libs 1.14.6-r3 apk +dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.6.2 php-composer @@ -46,6 +46,7 @@ freetype 2.13.0-r5 apk fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r1 apk git 2.40.1-r0 apk +git-perl 2.40.1-r0 apk glib 2.76.3-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.7.0 php-composer @@ -75,12 +76,12 @@ league/oauth2-client 2.7.0 php-composer libacl 2.3.1-r3 apk libattr 2.5.1-r4 apk libavif 0.11.1-r2 apk -libblkid 2.38.1-r7 apk +libblkid 2.38.1-r8 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.1-r1 apk -libcurl 8.1.1-r1 apk +libcurl 8.1.2-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk @@ -95,7 +96,7 @@ libjpeg-turbo 2.1.5.1-r2 apk libldap 2.6.4-r3 apk libmd 1.0.4-r2 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.38.1-r7 apk +libmount 2.38.1-r8 apk libncursesw 6.4_p20230506-r0 apk libpcre2-16 10.42-r1 apk libpng 1.6.39-r3 apk @@ -106,7 +107,7 @@ libsm 1.2.4-r1 apk libssl3 3.1.1-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk -libuuid 2.38.1-r7 apk +libuuid 2.38.1-r8 apk libwebp 1.3.0-r2 apk libx11 1.8.4-r3 apk libxau 1.0.11-r2 apk @@ -119,6 +120,8 @@ libxt 1.3.0-r2 apk libzip 1.9.2-r2 apk linux-pam 1.5.2-r10 apk logrotate 3.21.0-r1 apk +mariadb-client 10.11.4-r0 apk +mariadb-common 10.11.4-r0 apk masterminds/html5 2.8.0 php-composer memcached 1.6.20 binary memcached 1.6.20-r0 apk @@ -148,6 +151,9 @@ paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk pcre2 10.42-r1 apk +perl 5.36.1-r2 apk +perl-error 0.17029-r1 apk +perl-git 2.40.1-r0 apk phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer @@ -158,25 +164,25 @@ php82 8.2.6-r1 apk php82-common 8.2.6-r1 apk php82-ctype 8.2.6-r1 apk php82-curl 8.2.6-r1 apk -php82-dom 8.2.6-r1 apk +php82-dom 8.2.7-r0 apk php82-fileinfo 8.2.6-r1 apk php82-fpm 8.2.6-r1 apk -php82-gd 8.2.6-r1 apk +php82-gd 8.2.7-r0 apk php82-iconv 8.2.6-r1 apk -php82-ldap 8.2.6-r1 apk +php82-ldap 8.2.7-r0 apk php82-mbstring 8.2.6-r1 apk -php82-mysqlnd 8.2.6-r1 apk +php82-mysqlnd 8.2.7-r0 apk php82-openssl 8.2.6-r1 apk -php82-pdo 8.2.6-r1 apk -php82-pdo_mysql 8.2.6-r1 apk +php82-pdo 8.2.7-r0 apk +php82-pdo_mysql 8.2.7-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-phar 8.2.6-r1 apk php82-session 8.2.6-r1 apk php82-simplexml 8.2.6-r1 apk -php82-sockets 8.2.6-r1 apk -php82-tokenizer 8.2.6-r1 apk +php82-sockets 8.2.7-r0 apk +php82-tokenizer 8.2.7-r0 apk php82-xml 8.2.6-r1 apk php82-xmlwriter 8.2.6-r1 apk php82-zip 8.2.6-r1 apk @@ -239,7 +245,7 @@ socialiteproviders/twitch 5.3.1 php-composer squizlabs/php_codesniffer 3.7.2 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer -ssl_client 1.36.0-r9 apk +ssl_client 1.36.1-r0 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer From 7689b64cf2966182da8640b5cc10e95ff1bb5686 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Jun 2023 18:22:24 +0000 Subject: [PATCH 265/452] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d393df9..2d2924c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -158,34 +158,34 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.2.6 binary -php-fpm 8.2.6 binary -php82 8.2.6-r1 apk -php82-common 8.2.6-r1 apk -php82-ctype 8.2.6-r1 apk -php82-curl 8.2.6-r1 apk +php-cli 8.2.7 binary +php-fpm 8.2.7 binary +php82 8.2.7-r0 apk +php82-common 8.2.7-r0 apk +php82-ctype 8.2.7-r0 apk +php82-curl 8.2.7-r0 apk php82-dom 8.2.7-r0 apk -php82-fileinfo 8.2.6-r1 apk -php82-fpm 8.2.6-r1 apk +php82-fileinfo 8.2.7-r0 apk +php82-fpm 8.2.7-r0 apk php82-gd 8.2.7-r0 apk -php82-iconv 8.2.6-r1 apk +php82-iconv 8.2.7-r0 apk php82-ldap 8.2.7-r0 apk -php82-mbstring 8.2.6-r1 apk +php82-mbstring 8.2.7-r0 apk php82-mysqlnd 8.2.7-r0 apk -php82-openssl 8.2.6-r1 apk +php82-openssl 8.2.7-r0 apk php82-pdo 8.2.7-r0 apk php82-pdo_mysql 8.2.7-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.6-r1 apk -php82-session 8.2.6-r1 apk -php82-simplexml 8.2.6-r1 apk +php82-phar 8.2.7-r0 apk +php82-session 8.2.7-r0 apk +php82-simplexml 8.2.7-r0 apk php82-sockets 8.2.7-r0 apk php82-tokenizer 8.2.7-r0 apk -php82-xml 8.2.6-r1 apk -php82-xmlwriter 8.2.6-r1 apk -php82-zip 8.2.6-r1 apk +php82-xml 8.2.7-r0 apk +php82-xmlwriter 8.2.7-r0 apk +php82-zip 8.2.7-r0 apk phpmyadmin/sql-parser 5.7.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.19 php-composer From e5dd5dc0a18932981b47d703ac86b22896bb6fa5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Jun 2023 18:21:08 +0000 Subject: [PATCH 266/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2d2924c..2b893d6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -54,8 +54,8 @@ guzzlehttp/promises 1.5.3 php-composer guzzlehttp/psr7 2.5.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.1-r1 apk -icu-libs 73.1-r1 apk +icu-data-full 73.2-r0 apk +icu-libs 73.2-r0 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk @@ -92,7 +92,7 @@ libgcc 12.2.1_git20220924-r10 apk libice 1.1.1-r2 apk libidn2 2.3.4-r1 apk libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r2 apk +libjpeg-turbo 2.1.5.1-r3 apk libldap 2.6.4-r3 apk libmd 1.0.4-r2 apk libmemcached-libs 1.1.4-r1 apk @@ -109,7 +109,7 @@ libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk libwebp 1.3.0-r2 apk -libx11 1.8.4-r3 apk +libx11 1.8.4-r4 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk @@ -123,8 +123,8 @@ logrotate 3.21.0-r1 apk mariadb-client 10.11.4-r0 apk mariadb-common 10.11.4-r0 apk masterminds/html5 2.8.0 php-composer -memcached 1.6.20 binary -memcached 1.6.20-r0 apk +memcached 1.6.21 binary +memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk mockery/mockery 1.5.1 php-composer monolog/monolog 2.9.1 php-composer From bf799eede6b1bb0f58a81b7ae982a3db96b5be78 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Jun 2023 18:23:35 +0000 Subject: [PATCH 267/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2b893d6..64cb9de 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,7 +2,7 @@ NAME VERSION TYPE alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.0-r0 apk +alpine-release 3.18.2-r0 apk aom-libs 3.6.1-r0 apk apache2-utils 2.4.57-r2 apk apk-tools 2.14.0-r2 apk @@ -233,7 +233,7 @@ sebastian/recursion-context 4.0.5 php-composer sebastian/resource-operations 3.0.3 php-composer sebastian/type 3.2.1 php-composer sebastian/version 3.0.2 php-composer -shadow 4.13-r2 apk +shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk socialiteproviders/discord 4.1.2 php-composer socialiteproviders/gitlab 4.1.0 php-composer From f56f469718fb690354577c874d576a94b195867c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 30 Jun 2023 10:36:41 +0000 Subject: [PATCH 268/452] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 64cb9de..3ffa846 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,17 +28,17 @@ dasprid/enum 1.0.4 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.2 php-composer -doctrine/deprecations v1.0.0 php-composer +doctrine/dbal 3.6.4 php-composer +doctrine/deprecations v1.1.1 php-composer doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.6 php-composer +doctrine/inflector 2.0.8 php-composer doctrine/instantiator 1.5.0 php-composer doctrine/lexer 2.1.0 php-composer dompdf/dompdf v2.0.3 php-composer dragonmantank/cron-expression v3.3.2 php-composer -egulias/email-validator 3.2.5 php-composer +egulias/email-validator 3.2.6 php-composer encodings 1.0.7-r1 apk -fakerphp/faker v1.22.0 php-composer +fakerphp/faker v1.23.0 php-composer filp/whoops 2.15.2 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r3 apk @@ -60,9 +60,9 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.7 php-composer +laravel/framework v9.52.9 php-composer laravel/serializable-closure v1.3.0 php-composer -laravel/socialite v5.6.1 php-composer +laravel/socialite v5.6.3 php-composer laravel/tinker v2.8.1 php-composer league/commonmark 2.4.0 php-composer league/config v1.2.0 php-composer @@ -108,7 +108,7 @@ libssl3 3.1.1-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk -libwebp 1.3.0-r2 apk +libwebp 1.3.1-r0 apk libx11 1.8.4-r4 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk @@ -126,7 +126,7 @@ masterminds/html5 2.8.0 php-composer memcached 1.6.21 binary memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk -mockery/mockery 1.5.1 php-composer +mockery/mockery 1.6.2 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer musl 1.2.4-r0 apk @@ -134,7 +134,7 @@ musl-utils 1.2.4-r0 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.66.0 php-composer +nesbot/carbon 2.67.0 php-composer netcat-openbsd 1.219-r1 apk nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer @@ -142,7 +142,7 @@ nghttp2-libs 1.53.0-r0 apk nginx 1.24.0-r6 apk nikic/php-parser v4.15.5 php-composer nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.0 php-composer +nunomaduro/larastan v2.6.3 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk @@ -186,19 +186,19 @@ php82-tokenizer 8.2.7-r0 apk php82-xml 8.2.7-r0 apk php82-xmlwriter 8.2.7-r0 apk php82-zip 8.2.7-r0 apk -phpmyadmin/sql-parser 5.7.0 php-composer +phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.19 php-composer -phpstan/phpstan 1.10.15 php-composer +phpseclib/phpseclib 3.0.20 php-composer +phpstan/phpstan 1.10.21 php-composer phpunit/php-code-coverage 9.2.26 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.8 php-composer +phpunit/phpunit 9.6.9 php-composer popt 1.19-r2 apk pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.1.2 php-composer +predis/predis v2.2.0 php-composer procps-ng 4.0.3-r1 apk psr/cache 3.0.0 php-composer psr/container 2.0.2 php-composer @@ -208,7 +208,7 @@ psr/http-factory 1.0.2 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.17 php-composer +psy/psysh v0.11.18 php-composer qt5-qtbase 5.15.9_git20230505-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer From 9fad9dc45b9867563afbf396925d6c35beb993af Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 18:22:00 +0000 Subject: [PATCH 269/452] Bot Updating Templated Files --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7599ede..3da172e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -290,7 +290,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -326,12 +326,13 @@ pipeline { mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then echo ".jenkins-external" >> .gitignore git add .gitignore fi - git add ${TEMPLATED_FILES} + git add readme-vars.yml ${TEMPLATED_FILES} git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} From cbeae026d47c2ffb9acdcec944f972c45133628d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Jul 2023 18:24:49 +0000 Subject: [PATCH 270/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3ffa846..ca15ba3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -54,8 +54,8 @@ guzzlehttp/promises 1.5.3 php-composer guzzlehttp/psr7 2.5.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r0 apk -icu-libs 73.2-r0 apk +icu-data-full 73.2-r1 apk +icu-libs 73.2-r1 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk From 8cacf766f69e199048652c8770afe4223c5ca93a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 5 Jul 2023 13:00:40 +0000 Subject: [PATCH 271/452] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ca15ba3..62d52cd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -60,7 +60,7 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.9 php-composer +laravel/framework v9.52.10 php-composer laravel/serializable-closure v1.3.0 php-composer laravel/socialite v5.6.3 php-composer laravel/tinker v2.8.1 php-composer @@ -134,13 +134,13 @@ musl-utils 1.2.4-r0 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.67.0 php-composer +nesbot/carbon 2.68.1 php-composer netcat-openbsd 1.219-r1 apk nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.53.0-r0 apk nginx 1.24.0-r6 apk -nikic/php-parser v4.15.5 php-composer +nikic/php-parser v4.16.0 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/larastan v2.6.3 php-composer nunomaduro/termwind v1.15.1 php-composer @@ -189,7 +189,7 @@ php82-zip 8.2.7-r0 apk phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.20 php-composer -phpstan/phpstan 1.10.21 php-composer +phpstan/phpstan 1.10.23 php-composer phpunit/php-code-coverage 9.2.26 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer @@ -245,6 +245,7 @@ socialiteproviders/twitch 5.3.1 php-composer squizlabs/php_codesniffer 3.7.2 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer +ssddanbrown/symfony-mailer 6.0.x-dev php-composer ssl_client 1.36.1-r0 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer @@ -256,7 +257,6 @@ symfony/event-dispatcher-contracts v3.0.2 php-composer symfony/finder v6.0.19 php-composer symfony/http-foundation v6.0.20 php-composer symfony/http-kernel v6.0.20 php-composer -symfony/mailer v6.0.19 php-composer symfony/mime v6.0.19 php-composer symfony/polyfill-ctype v1.27.0 php-composer symfony/polyfill-intl-grapheme v1.27.0 php-composer From 01114edaa3592cf972d9e7794a7f1b5e11b67415 Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 6 Jul 2023 08:47:30 -0400 Subject: [PATCH 272/452] remove wkhtmltopdf section of readme --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index ecd4344..10752b2 100644 --- a/README.md +++ b/README.md @@ -92,11 +92,6 @@ If you wish to use the extra functionality of BookStack such as email, Memcache, When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. -#### PDF Rendering -[wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. - -The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`. - ## Usage Here are some example snippets to help you get started creating a container. From edd48f8708f452ef8ace3ecb25d05eff11c2e4ca Mon Sep 17 00:00:00 2001 From: driz <40674481+drizuid@users.noreply.github.com> Date: Thu, 6 Jul 2023 08:48:42 -0400 Subject: [PATCH 273/452] Update readme-vars.yml --- readme-vars.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 13a67dc..06ab3a9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -108,11 +108,6 @@ app_setup_block: | If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. - - #### PDF Rendering - [wkhtmltopdf](https://wkhtmltopdf.org/) is available to use as an alternative PDF rendering generator as described at https://www.bookstackapp.com/docs/admin/pdf-rendering/. - - The path to wkhtmltopdf in this image to include in your .env file is `/usr/bin/wkhtmltopdf`. # changelog From 70c02cc704b1898d5f5cb9427b37905741d8bcb6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Jul 2023 18:23:30 +0000 Subject: [PATCH 274/452] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 62d52cd..e2b661f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk alpine-release 3.18.2-r0 apk aom-libs 3.6.1-r0 apk -apache2-utils 2.4.57-r2 apk +apache2-utils 2.4.57-r3 apk apk-tools 2.14.0-r2 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk @@ -47,7 +47,7 @@ fruitcake/php-cors v1.2.0 php-composer gdbm 1.23-r1 apk git 2.40.1-r0 apk git-perl 2.40.1-r0 apk -glib 2.76.3-r0 apk +glib 2.76.4-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.7.0 php-composer guzzlehttp/promises 1.5.3 php-composer @@ -164,25 +164,25 @@ php82 8.2.7-r0 apk php82-common 8.2.7-r0 apk php82-ctype 8.2.7-r0 apk php82-curl 8.2.7-r0 apk -php82-dom 8.2.7-r0 apk +php82-dom 8.2.8-r0 apk php82-fileinfo 8.2.7-r0 apk php82-fpm 8.2.7-r0 apk -php82-gd 8.2.7-r0 apk +php82-gd 8.2.8-r0 apk php82-iconv 8.2.7-r0 apk -php82-ldap 8.2.7-r0 apk +php82-ldap 8.2.8-r0 apk php82-mbstring 8.2.7-r0 apk -php82-mysqlnd 8.2.7-r0 apk +php82-mysqlnd 8.2.8-r0 apk php82-openssl 8.2.7-r0 apk -php82-pdo 8.2.7-r0 apk -php82-pdo_mysql 8.2.7-r0 apk +php82-pdo 8.2.8-r0 apk +php82-pdo_mysql 8.2.8-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-phar 8.2.7-r0 apk php82-session 8.2.7-r0 apk php82-simplexml 8.2.7-r0 apk -php82-sockets 8.2.7-r0 apk -php82-tokenizer 8.2.7-r0 apk +php82-sockets 8.2.8-r0 apk +php82-tokenizer 8.2.8-r0 apk php82-xml 8.2.7-r0 apk php82-xmlwriter 8.2.7-r0 apk php82-zip 8.2.7-r0 apk From 914301a9ea69664de78bf78117fbface17c3ea4a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 11 Jul 2023 13:20:42 +0000 Subject: [PATCH 275/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e2b661f..a34669b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libice 1.1.1-r2 apk libidn2 2.3.4-r1 apk libintl 0.21.1-r7 apk libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.4-r3 apk +libldap 2.6.5-r0 apk libmd 1.0.4-r2 apk libmemcached-libs 1.1.4-r1 apk libmount 2.38.1-r8 apk From 54488670f175d942618cd5081a10cc7f76c95105 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Jul 2023 18:25:56 +0000 Subject: [PATCH 276/452] Bot Updating Package Versions --- package_versions.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a34669b..03ba7e3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,8 +18,8 @@ bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk busybox 1.36.1 binary -busybox 1.36.1-r0 apk -busybox-binsh 1.36.1-r0 apk +busybox 1.36.1-r1 apk +busybox-binsh 1.36.1-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk @@ -54,8 +54,8 @@ guzzlehttp/promises 1.5.3 php-composer guzzlehttp/psr7 2.5.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r1 apk -icu-libs 73.2-r1 apk +icu-data-full 73.2-r2 apk +icu-libs 73.2-r2 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk @@ -158,34 +158,34 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.2.7 binary -php-fpm 8.2.7 binary -php82 8.2.7-r0 apk -php82-common 8.2.7-r0 apk -php82-ctype 8.2.7-r0 apk -php82-curl 8.2.7-r0 apk +php-cli 8.2.8 binary +php-fpm 8.2.8 binary +php82 8.2.8-r0 apk +php82-common 8.2.8-r0 apk +php82-ctype 8.2.8-r0 apk +php82-curl 8.2.8-r0 apk php82-dom 8.2.8-r0 apk -php82-fileinfo 8.2.7-r0 apk -php82-fpm 8.2.7-r0 apk +php82-fileinfo 8.2.8-r0 apk +php82-fpm 8.2.8-r0 apk php82-gd 8.2.8-r0 apk -php82-iconv 8.2.7-r0 apk +php82-iconv 8.2.8-r0 apk php82-ldap 8.2.8-r0 apk -php82-mbstring 8.2.7-r0 apk +php82-mbstring 8.2.8-r0 apk php82-mysqlnd 8.2.8-r0 apk -php82-openssl 8.2.7-r0 apk +php82-openssl 8.2.8-r0 apk php82-pdo 8.2.8-r0 apk php82-pdo_mysql 8.2.8-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.7-r0 apk -php82-session 8.2.7-r0 apk -php82-simplexml 8.2.7-r0 apk +php82-phar 8.2.8-r0 apk +php82-session 8.2.8-r0 apk +php82-simplexml 8.2.8-r0 apk php82-sockets 8.2.8-r0 apk php82-tokenizer 8.2.8-r0 apk -php82-xml 8.2.7-r0 apk -php82-xmlwriter 8.2.7-r0 apk -php82-zip 8.2.7-r0 apk +php82-xml 8.2.8-r0 apk +php82-xmlwriter 8.2.8-r0 apk +php82-zip 8.2.8-r0 apk phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.20 php-composer @@ -246,7 +246,7 @@ squizlabs/php_codesniffer 3.7.2 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r0 apk +ssl_client 1.36.1-r1 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer From 078e1512ed6041b0ef6c94699d366cfc28ca3c17 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Jul 2023 18:22:42 +0000 Subject: [PATCH 277/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 03ba7e3..fcf7f59 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,7 +80,7 @@ libblkid 2.38.1-r8 apk libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r1 apk +libcrypto3 3.1.1-r3 apk libcurl 8.1.2-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -104,7 +104,7 @@ libproc2 4.0.3-r1 apk libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.1-r1 apk +libssl3 3.1.1-r3 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -146,7 +146,7 @@ nunomaduro/larastan v2.6.3 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.1-r1 apk +openssl 3.1.1-r3 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk From e654f6ca12bdd1cc0f1fbd35e391897e457ceaa4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 31 Jul 2023 18:22:24 +0000 Subject: [PATCH 278/452] Bot Updating Package Versions --- package_versions.txt | 575 ++++++++++++++++++++++--------------------- 1 file changed, 288 insertions(+), 287 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fcf7f59..66357ac 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,287 +1,288 @@ -NAME VERSION TYPE -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.2-r0 apk -aom-libs 3.6.1-r0 apk -apache2-utils 2.4.57-r3 apk -apk-tools 2.14.0-r2 apk -apr 1.7.4-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r4 apk -aws/aws-crt-php v1.2.1 php-composer -aws/aws-sdk-php 3.269.0 php-composer -bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.15-r5 apk -brick/math 0.11.0 php-composer -brotli-libs 1.0.9-r14 apk -busybox 1.36.1 binary -busybox 1.36.1-r1 apk -busybox-binsh 1.36.1-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -coreutils 9.3-r1 apk -curl 8.1.2-r0 apk -dasprid/enum 1.0.4 php-composer -dbus-libs 1.14.8-r0 apk -dflydev/dot-access-data v3.0.2 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.4 php-composer -doctrine/deprecations v1.1.1 php-composer -doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.8 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.0 php-composer -dompdf/dompdf v2.0.3 php-composer -dragonmantank/cron-expression v3.3.2 php-composer -egulias/email-validator 3.2.6 php-composer -encodings 1.0.7-r1 apk -fakerphp/faker v1.23.0 php-composer -filp/whoops 2.15.2 php-composer -font-freefont 20120503-r4 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fruitcake/php-cors v1.2.0 php-composer -gdbm 1.23-r1 apk -git 2.40.1-r0 apk -git-perl 2.40.1-r0 apk -glib 2.76.4-r0 apk -graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.7.0 php-composer -guzzlehttp/promises 1.5.3 php-composer -guzzlehttp/psr7 2.5.0 php-composer -guzzlehttp/uri-template v1.0.1 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r2 apk -icu-libs 73.2-r2 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r3 apk -knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.10 php-composer -laravel/serializable-closure v1.3.0 php-composer -laravel/socialite v5.6.3 php-composer -laravel/tinker v2.8.1 php-composer -league/commonmark 2.4.0 php-composer -league/config v1.2.0 php-composer -league/flysystem 3.15.1 php-composer -league/flysystem-aws-s3-v3 3.15.0 php-composer -league/flysystem-local 3.15.0 php-composer -league/html-to-markdown 5.1.0 php-composer -league/mime-type-detection 1.11.0 php-composer -league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r3 apk -libattr 2.5.1-r4 apk -libavif 0.11.1-r2 apk -libblkid 2.38.1-r8 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r3 apk -libcurl 8.1.2-r0 apk -libdav1d 1.2.1-r0 apk -libedit 20221030.3.1-r1 apk -libevent 2.1.12-r6 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libfontenc 1.1.7-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libice 1.1.1-r2 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.5-r0 apk -libmd 1.0.4-r2 apk -libmemcached-libs 1.1.4-r1 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libpcre2-16 10.42-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.3-r1 apk -libsasl 2.1.28-r4 apk -libseccomp 2.5.4-r2 apk -libsm 1.2.4-r1 apk -libssl3 3.1.1-r3 apk -libstdc++ 12.2.1_git20220924-r10 apk -libunistring 1.1-r1 apk -libuuid 2.38.1-r8 apk -libwebp 1.3.1-r0 apk -libx11 1.8.4-r4 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxml2 2.11.4-r0 apk -libxpm 3.5.16-r1 apk -libxt 1.3.0-r2 apk -libzip 1.9.2-r2 apk -linux-pam 1.5.2-r10 apk -logrotate 3.21.0-r1 apk -mariadb-client 10.11.4-r0 apk -mariadb-common 10.11.4-r0 apk -masterminds/html5 2.8.0 php-composer -memcached 1.6.21 binary -memcached 1.6.21-r0 apk -mkfontscale 1.2.2-r3 apk -mockery/mockery 1.6.2 php-composer -monolog/monolog 2.9.1 php-composer -mtdowling/jmespath.php 2.6.1 php-composer -musl 1.2.4-r0 apk -musl-utils 1.2.4-r0 apk -myclabs/deep-copy 1.11.1 php-composer -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.68.1 php-composer -netcat-openbsd 1.219-r1 apk -nette/schema v1.2.3 php-composer -nette/utils v4.0.0 php-composer -nghttp2-libs 1.53.0-r0 apk -nginx 1.24.0-r6 apk -nikic/php-parser v4.16.0 php-composer -nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.3 php-composer -nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.8-r1 apk -openssl 3.1.1-r3 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r3 apk -pcre2 10.42-r1 apk -perl 5.36.1-r2 apk -perl-error 0.17029-r1 apk -perl-git 2.40.1-r0 apk -phar-io/manifest 2.0.3 php-composer -phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.4 php-composer -phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.2.8 binary -php-fpm 8.2.8 binary -php82 8.2.8-r0 apk -php82-common 8.2.8-r0 apk -php82-ctype 8.2.8-r0 apk -php82-curl 8.2.8-r0 apk -php82-dom 8.2.8-r0 apk -php82-fileinfo 8.2.8-r0 apk -php82-fpm 8.2.8-r0 apk -php82-gd 8.2.8-r0 apk -php82-iconv 8.2.8-r0 apk -php82-ldap 8.2.8-r0 apk -php82-mbstring 8.2.8-r0 apk -php82-mysqlnd 8.2.8-r0 apk -php82-openssl 8.2.8-r0 apk -php82-pdo 8.2.8-r0 apk -php82-pdo_mysql 8.2.8-r0 apk -php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-memcached 3.2.0-r1 apk -php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.8-r0 apk -php82-session 8.2.8-r0 apk -php82-simplexml 8.2.8-r0 apk -php82-sockets 8.2.8-r0 apk -php82-tokenizer 8.2.8-r0 apk -php82-xml 8.2.8-r0 apk -php82-xmlwriter 8.2.8-r0 apk -php82-zip 8.2.8-r0 apk -phpmyadmin/sql-parser 5.8.0 php-composer -phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.20 php-composer -phpstan/phpstan 1.10.23 php-composer -phpunit/php-code-coverage 9.2.26 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.9 php-composer -popt 1.19-r2 apk -pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.0 php-composer -procps-ng 4.0.3-r1 apk -psr/cache 3.0.0 php-composer -psr/container 2.0.2 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.2 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer -psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.18 php-composer -qt5-qtbase 5.15.9_git20230505-r0 apk -ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.4 php-composer -readline 8.2.1-r1 apk -robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser 8.4.0 php-composer -scanelf 1.3.7-r1 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.2 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.5 php-composer -sebastian/lines-of-code 1.0.3 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -socialiteproviders/discord 4.1.2 php-composer -socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.3.0 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.2.1 php-composer -socialiteproviders/slack 4.1.1 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.7.2 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r1 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.27.0 php-composer -symfony/polyfill-intl-grapheme v1.27.0 php-composer -symfony/polyfill-intl-idn v1.27.0 php-composer -symfony/polyfill-intl-normalizer v1.27.0 php-composer -symfony/polyfill-mbstring v1.27.0 php-composer -symfony/polyfill-php72 v1.27.0 php-composer -symfony/polyfill-php80 v1.27.0 php-composer -symfony/polyfill-php81 v1.27.0 php-composer -symfony/polyfill-uuid v1.27.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.1 php-composer -tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -vlucas/phpdotenv v5.5.0 php-composer -voku/portable-ascii 2.0.1 php-composer -webmozart/assert 1.11.0 php-composer -xz-libs 5.4.3-r0 apk -zlib 1.2.13-r1 apk -zstd-libs 1.5.5-r4 apk +NAME VERSION TYPE +Reads from stdin without leaking info to the terminal and outputs back to stdout 1, 0, 0, 0 dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.2-r0 apk +aom-libs 3.6.1-r0 apk +apache2-utils 2.4.57-r3 apk +apk-tools 2.14.0-r2 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r4 apk +aws/aws-crt-php v1.2.1 php-composer +aws/aws-sdk-php 3.269.0 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer +bash 5.2.15-r5 apk +brick/math 0.11.0 php-composer +brotli-libs 1.0.9-r14 apk +busybox 1.36.1 binary +busybox 1.36.1-r1 apk +busybox-binsh 1.36.1-r1 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +coreutils 9.3-r1 apk +curl 8.2.0-r1 apk +dasprid/enum 1.0.4 php-composer +dbus-libs 1.14.8-r0 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.6.4 php-composer +doctrine/deprecations v1.1.1 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.8 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.0 php-composer +dompdf/dompdf v2.0.3 php-composer +dragonmantank/cron-expression v3.3.2 php-composer +egulias/email-validator 3.2.6 php-composer +encodings 1.0.7-r1 apk +fakerphp/faker v1.23.0 php-composer +filp/whoops 2.15.2 php-composer +font-freefont 20120503-r4 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fruitcake/php-cors v1.2.0 php-composer +gdbm 1.23-r1 apk +git 2.40.1-r0 apk +git-perl 2.40.1-r0 apk +glib 2.76.4-r0 apk +graham-campbell/result-type v1.1.1 php-composer +guzzlehttp/guzzle 7.7.0 php-composer +guzzlehttp/promises 1.5.3 php-composer +guzzlehttp/psr7 2.5.0 php-composer +guzzlehttp/uri-template v1.0.1 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +icu-data-full 73.2-r2 apk +icu-libs 73.2-r2 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.1.12 php-composer +jq 1.6-r3 apk +knplabs/knp-snappy v1.4.2 php-composer +laravel/framework v9.52.10 php-composer +laravel/serializable-closure v1.3.0 php-composer +laravel/socialite v5.6.3 php-composer +laravel/tinker v2.8.1 php-composer +league/commonmark 2.4.0 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.15.1 php-composer +league/flysystem-aws-s3-v3 3.15.0 php-composer +league/flysystem-local 3.15.0 php-composer +league/html-to-markdown 5.1.0 php-composer +league/mime-type-detection 1.11.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.7.0 php-composer +libacl 2.3.1-r3 apk +libattr 2.5.1-r4 apk +libavif 0.11.1-r2 apk +libblkid 2.38.1-r8 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.1-r3 apk +libcurl 8.2.0-r1 apk +libdav1d 1.2.1-r0 apk +libedit 20221030.3.1-r1 apk +libevent 2.1.12-r6 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libfontenc 1.1.7-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libice 1.1.1-r2 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libldap 2.6.5-r0 apk +libmd 1.0.4-r2 apk +libmemcached-libs 1.1.4-r1 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libpcre2-16 10.42-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.3-r1 apk +libsasl 2.1.28-r4 apk +libseccomp 2.5.4-r2 apk +libsm 1.2.4-r1 apk +libssl3 3.1.1-r3 apk +libstdc++ 12.2.1_git20220924-r10 apk +libunistring 1.1-r1 apk +libuuid 2.38.1-r8 apk +libwebp 1.3.1-r0 apk +libx11 1.8.4-r4 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxml2 2.11.4-r0 apk +libxpm 3.5.16-r1 apk +libxt 1.3.0-r2 apk +libzip 1.9.2-r2 apk +linux-pam 1.5.2-r10 apk +logrotate 3.21.0-r1 apk +mariadb-client 10.11.4-r0 apk +mariadb-common 10.11.4-r0 apk +masterminds/html5 2.8.0 php-composer +memcached 1.6.21 binary +memcached 1.6.21-r0 apk +mkfontscale 1.2.2-r3 apk +mockery/mockery 1.6.2 php-composer +monolog/monolog 2.9.1 php-composer +mtdowling/jmespath.php 2.6.1 php-composer +musl 1.2.4-r0 apk +musl-utils 1.2.4-r0 apk +myclabs/deep-copy 1.11.1 php-composer +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +nesbot/carbon 2.68.1 php-composer +netcat-openbsd 1.219-r1 apk +nette/schema v1.2.3 php-composer +nette/utils v4.0.0 php-composer +nghttp2-libs 1.55.1-r0 apk +nginx 1.24.0-r6 apk +nikic/php-parser v4.16.0 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/larastan v2.6.3 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.8-r1 apk +openssl 3.1.1-r3 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r1 apk +perl 5.36.1-r2 apk +perl-error 0.17029-r1 apk +perl-git 2.40.1-r0 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.4 php-composer +phenx/php-svg-lib 0.5.0 php-composer +php-cli 8.2.8 binary +php-fpm 8.2.8 binary +php82 8.2.8-r0 apk +php82-common 8.2.8-r0 apk +php82-ctype 8.2.8-r0 apk +php82-curl 8.2.8-r0 apk +php82-dom 8.2.8-r0 apk +php82-fileinfo 8.2.8-r0 apk +php82-fpm 8.2.8-r0 apk +php82-gd 8.2.8-r0 apk +php82-iconv 8.2.8-r0 apk +php82-ldap 8.2.8-r0 apk +php82-mbstring 8.2.8-r0 apk +php82-mysqlnd 8.2.8-r0 apk +php82-openssl 8.2.8-r0 apk +php82-pdo 8.2.8-r0 apk +php82-pdo_mysql 8.2.8-r0 apk +php82-pecl-igbinary 3.2.14-r0 apk +php82-pecl-memcached 3.2.0-r1 apk +php82-pecl-msgpack 2.2.0-r0 apk +php82-phar 8.2.8-r0 apk +php82-session 8.2.8-r0 apk +php82-simplexml 8.2.8-r0 apk +php82-sockets 8.2.8-r0 apk +php82-tokenizer 8.2.8-r0 apk +php82-xml 8.2.8-r0 apk +php82-xmlwriter 8.2.8-r0 apk +php82-zip 8.2.8-r0 apk +phpmyadmin/sql-parser 5.8.0 php-composer +phpoption/phpoption 1.9.1 php-composer +phpseclib/phpseclib 3.0.20 php-composer +phpstan/phpstan 1.10.23 php-composer +phpunit/php-code-coverage 9.2.26 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.9 php-composer +popt 1.19-r2 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.2.0 php-composer +procps-ng 4.0.3-r1 apk +psr/cache 3.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.2 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.11.18 php-composer +qt5-qtbase 5.15.9_git20230505-r0 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.4 php-composer +readline 8.2.1-r1 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser 8.4.0 php-composer +scanelf 1.3.7-r1 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.2 php-composer +sebastian/diff 4.0.5 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.5 php-composer +sebastian/lines-of-code 1.0.3 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +socialiteproviders/discord 4.1.2 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.3.0 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.2.1 php-composer +socialiteproviders/slack 4.1.1 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.7.2 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssddanbrown/symfony-mailer 6.0.x-dev php-composer +ssl_client 1.36.1-r1 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.27.0 php-composer +symfony/polyfill-intl-grapheme v1.27.0 php-composer +symfony/polyfill-intl-idn v1.27.0 php-composer +symfony/polyfill-intl-normalizer v1.27.0 php-composer +symfony/polyfill-mbstring v1.27.0 php-composer +symfony/polyfill-php72 v1.27.0 php-composer +symfony/polyfill-php80 v1.27.0 php-composer +symfony/polyfill-php81 v1.27.0 php-composer +symfony/polyfill-uuid v1.27.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.1 php-composer +tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +vlucas/phpdotenv v5.5.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz-libs 5.4.3-r0 apk +zlib 1.2.13-r1 apk +zstd-libs 1.5.5-r4 apk From b270eaf8a27a2f3b96710498c1b005e97de577b0 Mon Sep 17 00:00:00 2001 From: Jason Teng <git@jasony.org> Date: Sun, 6 Aug 2023 23:11:03 -0700 Subject: [PATCH 279/452] Add: password restriction match to db image manual per linuxserver/mariadb/, the required DATABASE_PASSWORD must > 4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10752b2..8e6d255 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | | `-e DB_USER=<yourdbuser>` | for specifying the database user | -| `-e DB_PASS=<yourdbpass>` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | +| `-e DB_PASS=<yourdbpass>` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | From bb3a6b4f05379c5d64d0bed070910fc440e551a6 Mon Sep 17 00:00:00 2001 From: Jason Teng <git@jasony.org> Date: Sun, 6 Aug 2023 23:30:33 -0700 Subject: [PATCH 280/452] Revert "Add: password restriction match to db image manual" This reverts commit b270eaf8a27a2f3b96710498c1b005e97de577b0. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e6d255..10752b2 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | | `-e DB_USER=<yourdbuser>` | for specifying the database user | -| `-e DB_PASS=<yourdbpass>` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | +| `-e DB_PASS=<yourdbpass>` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | From 51c954c18b9fe9559eb43dbe554d856c09493528 Mon Sep 17 00:00:00 2001 From: Jason Teng <git@jasony.org> Date: Sun, 6 Aug 2023 23:32:53 -0700 Subject: [PATCH 281/452] Edit: moving change to readme-vars.yml --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 06ab3a9..25a6ea8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -29,7 +29,7 @@ param_env_vars: - { env_var: "DB_HOST", env_value: "<yourdbhost>", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "<yourdbport>", desc: "for specifying the database port if not default 3306" } - { env_var: "DB_USER", env_value: "<yourdbuser>", desc: "for specifying the database user" } - - { env_var: "DB_PASS", env_value: "<yourdbpass>", desc: "for specifying the database password (non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "DB_PASS", env_value: "<yourdbpass>", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } param_usage_include_ports: true From fd52002a3d2268c68a44956f984e0a4eb51a9ed5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Aug 2023 18:21:10 +0000 Subject: [PATCH 282/452] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 66357ac..68dbfd9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,12 +19,12 @@ bash brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk busybox 1.36.1 binary -busybox 1.36.1-r1 apk -busybox-binsh 1.36.1-r1 apk +busybox 1.36.1-r2 apk +busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk -curl 8.2.0-r1 apk +curl 8.2.1-r0 apk dasprid/enum 1.0.4 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -82,7 +82,7 @@ libbsd libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.1-r3 apk -libcurl 8.2.0-r1 apk +libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk @@ -130,8 +130,8 @@ mkfontscale mockery/mockery 1.6.2 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer -musl 1.2.4-r0 apk -musl-utils 1.2.4-r0 apk +musl 1.2.4-r1 apk +musl-utils 1.2.4-r1 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk @@ -247,7 +247,7 @@ squizlabs/php_codesniffer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r1 apk +ssl_client 1.36.1-r2 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer From 9f149726fdc70e992885f0ed2558b2290e78c157 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 11 Aug 2023 00:02:00 +0000 Subject: [PATCH 283/452] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 10752b2..8e6d255 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e DB_HOST=<yourdbhost>` | for specifying the database host | | `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | | `-e DB_USER=<yourdbuser>` | for specifying the database user | -| `-e DB_PASS=<yourdbpass>` | for specifying the database password (non-alphanumeric passwords must be properly escaped.) | +| `-e DB_PASS=<yourdbpass>` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-v /config` | this will store any uploaded data on the docker host | From a8c6d4b6531cacd8d265a0ddff8f44a24c087f3a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 11 Aug 2023 00:05:38 +0000 Subject: [PATCH 284/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 68dbfd9..096d260 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -81,7 +81,7 @@ libblkid libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.1-r3 apk +libcrypto3 3.1.2-r0 apk libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -105,7 +105,7 @@ libproc2 libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.1-r3 apk +libssl3 3.1.2-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -147,7 +147,7 @@ nunomaduro/larastan nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.1-r3 apk +openssl 3.1.2-r0 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk From 8cba53dfe82d27c5a3eec77444fcecb1b1bd30e3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Aug 2023 18:19:52 +0000 Subject: [PATCH 285/452] Bot Updating Package Versions --- package_versions.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 096d260..9ed7c51 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Reads from stdin without leaking info to the terminal and outputs back to stdout alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.2-r0 apk +alpine-release 3.18.3-r0 apk aom-libs 3.6.1-r0 apk apache2-utils 2.4.57-r3 apk apk-tools 2.14.0-r2 apk @@ -124,7 +124,6 @@ logrotate mariadb-client 10.11.4-r0 apk mariadb-common 10.11.4-r0 apk masterminds/html5 2.8.0 php-composer -memcached 1.6.21 binary memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk mockery/mockery 1.6.2 php-composer @@ -160,7 +159,6 @@ phar-io/version phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer php-cli 8.2.8 binary -php-fpm 8.2.8 binary php82 8.2.8-r0 apk php82-common 8.2.8-r0 apk php82-ctype 8.2.8-r0 apk From 6b7063dbbd4ebf8e189204383940aaf349079f21 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Aug 2023 18:22:44 +0000 Subject: [PATCH 286/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9ed7c51..210dda8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,6 @@ barryvdh/laravel-snappy bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk -busybox 1.36.1 binary busybox 1.36.1-r2 apk busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk @@ -124,6 +123,7 @@ logrotate mariadb-client 10.11.4-r0 apk mariadb-common 10.11.4-r0 apk masterminds/html5 2.8.0 php-composer +memcached 1.6.21 binary memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk mockery/mockery 1.6.2 php-composer From c0042bd7c646f0b7d9eeb7d70618b7ff78737523 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Aug 2023 18:26:24 +0000 Subject: [PATCH 287/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 210dda8..e86a229 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,6 +18,7 @@ barryvdh/laravel-snappy bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk +busybox 1.36.1 binary busybox 1.36.1-r2 apk busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk @@ -123,7 +124,6 @@ logrotate mariadb-client 10.11.4-r0 apk mariadb-common 10.11.4-r0 apk masterminds/html5 2.8.0 php-composer -memcached 1.6.21 binary memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk mockery/mockery 1.6.2 php-composer @@ -139,6 +139,7 @@ netcat-openbsd nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.55.1-r0 apk +nginx 1.24.0 binary nginx 1.24.0-r6 apk nikic/php-parser v4.16.0 php-composer nunomaduro/collision v6.4.0 php-composer @@ -158,7 +159,6 @@ phar-io/manifest phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.2.8 binary php82 8.2.8-r0 apk php82-common 8.2.8-r0 apk php82-ctype 8.2.8-r0 apk From e06fd86bc11e36981f685f4a6d44460c0da1e732 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Aug 2023 18:30:13 +0000 Subject: [PATCH 288/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e86a229..9ed7c51 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,6 @@ netcat-openbsd nette/schema v1.2.3 php-composer nette/utils v4.0.0 php-composer nghttp2-libs 1.55.1-r0 apk -nginx 1.24.0 binary nginx 1.24.0-r6 apk nikic/php-parser v4.16.0 php-composer nunomaduro/collision v6.4.0 php-composer @@ -159,6 +158,7 @@ phar-io/manifest phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer +php-cli 8.2.8 binary php82 8.2.8-r0 apk php82-common 8.2.8-r0 apk php82-ctype 8.2.8-r0 apk From 620c519455cd5006e67a23400240e199f7f72751 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Aug 2023 18:20:01 +0000 Subject: [PATCH 289/452] Bot Updating Package Versions --- package_versions.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9ed7c51..69ab0f0 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,7 +18,6 @@ barryvdh/laravel-snappy bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk -busybox 1.36.1 binary busybox 1.36.1-r2 apk busybox-binsh 1.36.1-r2 apk ca-certificates 20230506-r0 apk @@ -158,7 +157,6 @@ phar-io/manifest phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php-cli 8.2.8 binary php82 8.2.8-r0 apk php82-common 8.2.8-r0 apk php82-ctype 8.2.8-r0 apk From 1f7441a5127fbf59a88f8d69f40f915d4edb2a3d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Aug 2023 18:22:14 +0000 Subject: [PATCH 290/452] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 69ab0f0..f8db28e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -161,25 +161,25 @@ php82 php82-common 8.2.8-r0 apk php82-ctype 8.2.8-r0 apk php82-curl 8.2.8-r0 apk -php82-dom 8.2.8-r0 apk +php82-dom 8.2.9-r0 apk php82-fileinfo 8.2.8-r0 apk php82-fpm 8.2.8-r0 apk -php82-gd 8.2.8-r0 apk +php82-gd 8.2.9-r0 apk php82-iconv 8.2.8-r0 apk -php82-ldap 8.2.8-r0 apk +php82-ldap 8.2.9-r0 apk php82-mbstring 8.2.8-r0 apk -php82-mysqlnd 8.2.8-r0 apk +php82-mysqlnd 8.2.9-r0 apk php82-openssl 8.2.8-r0 apk -php82-pdo 8.2.8-r0 apk -php82-pdo_mysql 8.2.8-r0 apk +php82-pdo 8.2.9-r0 apk +php82-pdo_mysql 8.2.9-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-phar 8.2.8-r0 apk php82-session 8.2.8-r0 apk php82-simplexml 8.2.8-r0 apk -php82-sockets 8.2.8-r0 apk -php82-tokenizer 8.2.8-r0 apk +php82-sockets 8.2.9-r0 apk +php82-tokenizer 8.2.9-r0 apk php82-xml 8.2.8-r0 apk php82-xmlwriter 8.2.8-r0 apk php82-zip 8.2.8-r0 apk From 3ee35b4d79d183180d3b757fc137bdf2ba139599 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 30 Aug 2023 12:48:59 +0000 Subject: [PATCH 291/452] Bot Updating Package Versions --- package_versions.txt | 57 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f8db28e..b6c5dfe 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ apk-tools apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r4 apk -aws/aws-crt-php v1.2.1 php-composer -aws/aws-sdk-php 3.269.0 php-composer +aws/aws-crt-php v1.2.2 php-composer +aws/aws-sdk-php 3.279.2 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -28,18 +28,18 @@ dasprid/enum dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.4 php-composer +doctrine/dbal 3.6.6 php-composer doctrine/deprecations v1.1.1 php-composer doctrine/event-manager 1.2.0 php-composer doctrine/inflector 2.0.8 php-composer doctrine/instantiator 1.5.0 php-composer doctrine/lexer 2.1.0 php-composer dompdf/dompdf v2.0.3 php-composer -dragonmantank/cron-expression v3.3.2 php-composer +dragonmantank/cron-expression v3.3.3 php-composer egulias/email-validator 3.2.6 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.0 php-composer -filp/whoops 2.15.2 php-composer +filp/whoops 2.15.3 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r3 apk freetype 2.13.0-r5 apk @@ -50,8 +50,8 @@ git-perl glib 2.76.4-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.7.0 php-composer -guzzlehttp/promises 1.5.3 php-composer -guzzlehttp/psr7 2.5.0 php-composer +guzzlehttp/promises 2.0.1 php-composer +guzzlehttp/psr7 2.6.0 php-composer guzzlehttp/uri-template v1.0.1 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 73.2-r2 apk @@ -60,17 +60,17 @@ intervention/image itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.10 php-composer -laravel/serializable-closure v1.3.0 php-composer -laravel/socialite v5.6.3 php-composer +laravel/framework v9.52.15 php-composer +laravel/serializable-closure v1.3.1 php-composer +laravel/socialite v5.8.0 php-composer laravel/tinker v2.8.1 php-composer league/commonmark 2.4.0 php-composer league/config v1.2.0 php-composer league/flysystem 3.15.1 php-composer league/flysystem-aws-s3-v3 3.15.0 php-composer league/flysystem-local 3.15.0 php-composer -league/html-to-markdown 5.1.0 php-composer -league/mime-type-detection 1.11.0 php-composer +league/html-to-markdown 5.1.1 php-composer +league/mime-type-detection 1.13.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer libacl 2.3.1-r3 apk @@ -122,10 +122,10 @@ linux-pam logrotate 3.21.0-r1 apk mariadb-client 10.11.4-r0 apk mariadb-common 10.11.4-r0 apk -masterminds/html5 2.8.0 php-composer +masterminds/html5 2.8.1 php-composer memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk -mockery/mockery 1.6.2 php-composer +mockery/mockery 1.6.6 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer musl 1.2.4-r1 apk @@ -133,15 +133,15 @@ musl-utils myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.68.1 php-composer +nesbot/carbon 2.69.0 php-composer netcat-openbsd 1.219-r1 apk -nette/schema v1.2.3 php-composer -nette/utils v4.0.0 php-composer +nette/schema v1.2.4 php-composer +nette/utils v4.0.1 php-composer nghttp2-libs 1.55.1-r0 apk nginx 1.24.0-r6 apk -nikic/php-parser v4.16.0 php-composer +nikic/php-parser v4.17.1 php-composer nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.3 php-composer +nunomaduro/larastan v2.6.4 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk @@ -185,19 +185,20 @@ php82-xmlwriter php82-zip 8.2.8-r0 apk phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.20 php-composer -phpstan/phpstan 1.10.23 php-composer -phpunit/php-code-coverage 9.2.26 php-composer +phpseclib/phpseclib 3.0.21 php-composer +phpstan/phpstan 1.10.29 php-composer +phpunit/php-code-coverage 9.2.27 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.9 php-composer +phpunit/phpunit 9.6.11 php-composer popt 1.19-r2 apk pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.0 php-composer +predis/predis v2.2.1 php-composer procps-ng 4.0.3-r1 apk psr/cache 3.0.0 php-composer +psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer psr/http-client 1.0.2 php-composer @@ -205,7 +206,7 @@ psr/http-factory psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.18 php-composer +psy/psysh v0.11.20 php-composer qt5-qtbase 5.15.9_git20230505-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer @@ -222,7 +223,7 @@ sebastian/complexity sebastian/diff 4.0.5 php-composer sebastian/environment 5.1.5 php-composer sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.5 php-composer +sebastian/global-state 5.0.6 php-composer sebastian/lines-of-code 1.0.3 php-composer sebastian/object-enumerator 4.0.4 php-composer sebastian/object-reflector 2.0.4 php-composer @@ -232,11 +233,11 @@ sebastian/type sebastian/version 3.0.2 php-composer shadow 4.13-r4 apk skalibs 2.13.1.1-r1 apk -socialiteproviders/discord 4.1.2 php-composer +socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.3.0 php-composer socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.2.1 php-composer +socialiteproviders/okta 4.3.0 php-composer socialiteproviders/slack 4.1.1 php-composer socialiteproviders/twitch 5.3.1 php-composer squizlabs/php_codesniffer 3.7.2 php-composer From e3bcaad8224f284e99b9d73f973442ba14b168bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 3 Sep 2023 17:32:40 +0000 Subject: [PATCH 292/452] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b6c5dfe..8b551c7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -157,32 +157,32 @@ phar-io/manifest phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.8-r0 apk -php82-common 8.2.8-r0 apk -php82-ctype 8.2.8-r0 apk -php82-curl 8.2.8-r0 apk -php82-dom 8.2.9-r0 apk -php82-fileinfo 8.2.8-r0 apk -php82-fpm 8.2.8-r0 apk -php82-gd 8.2.9-r0 apk -php82-iconv 8.2.8-r0 apk -php82-ldap 8.2.9-r0 apk -php82-mbstring 8.2.8-r0 apk -php82-mysqlnd 8.2.9-r0 apk -php82-openssl 8.2.8-r0 apk -php82-pdo 8.2.9-r0 apk -php82-pdo_mysql 8.2.9-r0 apk +php82 8.2.9-r0 apk +php82-common 8.2.9-r0 apk +php82-ctype 8.2.9-r0 apk +php82-curl 8.2.9-r0 apk +php82-dom 8.2.10-r0 apk +php82-fileinfo 8.2.9-r0 apk +php82-fpm 8.2.9-r0 apk +php82-gd 8.2.10-r0 apk +php82-iconv 8.2.9-r0 apk +php82-ldap 8.2.10-r0 apk +php82-mbstring 8.2.9-r0 apk +php82-mysqlnd 8.2.10-r0 apk +php82-openssl 8.2.9-r0 apk +php82-pdo 8.2.10-r0 apk +php82-pdo_mysql 8.2.10-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.8-r0 apk -php82-session 8.2.8-r0 apk -php82-simplexml 8.2.8-r0 apk -php82-sockets 8.2.9-r0 apk -php82-tokenizer 8.2.9-r0 apk -php82-xml 8.2.8-r0 apk -php82-xmlwriter 8.2.8-r0 apk -php82-zip 8.2.8-r0 apk +php82-phar 8.2.9-r0 apk +php82-session 8.2.9-r0 apk +php82-simplexml 8.2.9-r0 apk +php82-sockets 8.2.10-r0 apk +php82-tokenizer 8.2.10-r0 apk +php82-xml 8.2.9-r0 apk +php82-xmlwriter 8.2.9-r0 apk +php82-zip 8.2.9-r0 apk phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.21 php-composer From 869d6181569d3882f5c6756fb7aa65513f43ef39 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 4 Sep 2023 09:22:10 +0100 Subject: [PATCH 293/452] Add async action support --- Dockerfile | 3 +-- Dockerfile.aarch64 | 3 +-- README.md | 4 +++- readme-vars.yml | 7 ++++--- .../svc-queue-worker/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type | 1 + root/init-hook | 9 +++++++++ 8 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type create mode 100755 root/init-hook diff --git a/Dockerfile b/Dockerfile index 7ef3d58..866abf6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,8 +9,7 @@ ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="homerr" -# package versions -ARG BOOKSTACK_RELEASE +ENV S6_STAGE2_HOOK="/init-hook" RUN \ echo "**** install runtime packages ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f93873c..8502dee 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,8 +9,7 @@ ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="homerr" -# package versions -ARG BOOKSTACK_RELEASE +ENV S6_STAGE2_HOOK="/init-hook" RUN \ echo "**** install runtime packages ****" && \ diff --git a/README.md b/README.md index 8e6d255..fb35f98 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ Below is a mapping of container `/config` paths to those relative within a BookS ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. - + When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. ## Usage @@ -152,6 +152,7 @@ docker run -d \ -e DB_USER=<yourdbuser> \ -e DB_PASS=<yourdbpass> \ -e DB_DATABASE=bookstackapp \ + -e QUEUE_CONNECTION= `#optional` \ -p 6875:80 \ -v /path/to/data:/config \ --restart unless-stopped \ @@ -175,6 +176,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e DB_USER=<yourdbuser>` | for specifying the database user | | `-e DB_PASS=<yourdbpass>` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | +| `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) diff --git a/readme-vars.yml b/readme-vars.yml index 25a6ea8..7943d04 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,8 +36,9 @@ param_usage_include_ports: true param_ports: - { external_port: "6875", internal_port: "80", port_desc: "will map the container's port 80 to port 6875 on the host" } -opt_param_usage_include_env: false +opt_param_usage_include_env: true opt_param_env_vars: + - { env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks." } custom_compose: | --- @@ -85,7 +86,7 @@ app_setup_block: | This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - + If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. @@ -106,7 +107,7 @@ app_setup_block: | ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. - + When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. diff --git a/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run b/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run new file mode 100755 index 0000000..a14bc14 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +echo "*** Starting Async Action Queue ***" + +exec /usr/bin/php /app/www/artisan queue:work --sleep=3 --tries=1 --max-time=3600 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type b/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-queue-worker/type @@ -0,0 +1 @@ +longrun diff --git a/root/init-hook b/root/init-hook new file mode 100755 index 0000000..906cefc --- /dev/null +++ b/root/init-hook @@ -0,0 +1,9 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +if [[ -n "${QUEUE_CONNECTION}" ]]; then + touch /etc/s6-overlay/s6-rc.d/user/contents.d/svc-queue-worker +fi + +exec \ + /docker-mods From 7245559a0085b0d51594e140e1ec1bcae76aff08 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Mon, 4 Sep 2023 09:25:52 +0100 Subject: [PATCH 294/452] Add link for async actions --- readme-vars.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 7943d04..4ebd797 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -25,11 +25,11 @@ param_volumes: param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} - - { env_var: "APP_URL", env_value: "<yourbaseurl>", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - - { env_var: "DB_HOST", env_value: "<yourdbhost>", desc: "for specifying the database host" } - - { env_var: "DB_PORT", env_value: "<yourdbport>", desc: "for specifying the database port if not default 3306" } - - { env_var: "DB_USER", env_value: "<yourdbuser>", desc: "for specifying the database user" } - - { env_var: "DB_PASS", env_value: "<yourdbpass>", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "APP_URL", env_value: "yourbaseurl", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - { env_var: "DB_HOST", env_value: "yourdbhost", desc: "for specifying the database host" } + - { env_var: "DB_PORT", env_value: "yourdbport", desc: "for specifying the database port if not default 3306" } + - { env_var: "DB_USER", env_value: "yourdbuser", desc: "for specifying the database user" } + - { env_var: "DB_PASS", env_value: "yourdbpass", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } param_usage_include_ports: true @@ -38,7 +38,7 @@ param_ports: opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks." } + - { env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)." } custom_compose: | --- From 48590fc969ec5b2d7800b377428605020b0435bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Sep 2023 11:03:26 +0000 Subject: [PATCH 295/452] Bot Updating Templated Files --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index fb35f98..b418985 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,11 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ - -e APP_URL=<yourbaseurl> \ - -e DB_HOST=<yourdbhost> \ - -e DB_PORT=<yourdbport> \ - -e DB_USER=<yourdbuser> \ - -e DB_PASS=<yourdbpass> \ + -e APP_URL=yourbaseurl \ + -e DB_HOST=yourdbhost \ + -e DB_PORT=yourdbport \ + -e DB_USER=yourdbuser \ + -e DB_PASS=yourdbpass \ -e DB_DATABASE=bookstackapp \ -e QUEUE_CONNECTION= `#optional` \ -p 6875:80 \ @@ -170,13 +170,13 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e APP_URL=<yourbaseurl>` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | -| `-e DB_HOST=<yourdbhost>` | for specifying the database host | -| `-e DB_PORT=<yourdbport>` | for specifying the database port if not default 3306 | -| `-e DB_USER=<yourdbuser>` | for specifying the database user | -| `-e DB_PASS=<yourdbpass>` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | +| `-e APP_URL=yourbaseurl` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | +| `-e DB_HOST=yourdbhost` | for specifying the database host | +| `-e DB_PORT=yourdbport` | for specifying the database port if not default 3306 | +| `-e DB_USER=yourdbuser` | for specifying the database user | +| `-e DB_PASS=yourdbpass` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | -| `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. | +| `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling). | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) From 0e1f787d644bd0738e1e59624a001d2be310d8fa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Sep 2023 18:21:19 +0000 Subject: [PATCH 296/452] Bot Updating Package Versions --- package_versions.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8b551c7..c5ede0e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -100,7 +100,7 @@ libmount libncursesw 6.4_p20230506-r0 apk libpcre2-16 10.42-r1 apk libpng 1.6.39-r3 apk -libproc2 4.0.3-r1 apk +libproc2 4.0.4-r0 apk libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk @@ -120,8 +120,8 @@ libxt libzip 1.9.2-r2 apk linux-pam 1.5.2-r10 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.4-r0 apk -mariadb-common 10.11.4-r0 apk +mariadb-client 10.11.5-r0 apk +mariadb-common 10.11.5-r0 apk masterminds/html5 2.8.1 php-composer memcached 1.6.21-r0 apk mkfontscale 1.2.2-r3 apk @@ -157,32 +157,32 @@ phar-io/manifest phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.9-r0 apk -php82-common 8.2.9-r0 apk -php82-ctype 8.2.9-r0 apk -php82-curl 8.2.9-r0 apk +php82 8.2.10-r0 apk +php82-common 8.2.10-r0 apk +php82-ctype 8.2.10-r0 apk +php82-curl 8.2.10-r0 apk php82-dom 8.2.10-r0 apk -php82-fileinfo 8.2.9-r0 apk -php82-fpm 8.2.9-r0 apk +php82-fileinfo 8.2.10-r0 apk +php82-fpm 8.2.10-r0 apk php82-gd 8.2.10-r0 apk -php82-iconv 8.2.9-r0 apk +php82-iconv 8.2.10-r0 apk php82-ldap 8.2.10-r0 apk -php82-mbstring 8.2.9-r0 apk +php82-mbstring 8.2.10-r0 apk php82-mysqlnd 8.2.10-r0 apk -php82-openssl 8.2.9-r0 apk +php82-openssl 8.2.10-r0 apk php82-pdo 8.2.10-r0 apk php82-pdo_mysql 8.2.10-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.9-r0 apk -php82-session 8.2.9-r0 apk -php82-simplexml 8.2.9-r0 apk +php82-phar 8.2.10-r0 apk +php82-session 8.2.10-r0 apk +php82-simplexml 8.2.10-r0 apk php82-sockets 8.2.10-r0 apk php82-tokenizer 8.2.10-r0 apk -php82-xml 8.2.9-r0 apk -php82-xmlwriter 8.2.9-r0 apk -php82-zip 8.2.9-r0 apk +php82-xml 8.2.10-r0 apk +php82-xmlwriter 8.2.10-r0 apk +php82-zip 8.2.10-r0 apk phpmyadmin/sql-parser 5.8.0 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.21 php-composer @@ -196,7 +196,7 @@ phpunit/phpunit popt 1.19-r2 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.1 php-composer -procps-ng 4.0.3-r1 apk +procps-ng 4.0.4-r0 apk psr/cache 3.0.0 php-composer psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer From cf00b4b528a699e341a34ca23371a65923709ee9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 15 Sep 2023 13:30:57 +0000 Subject: [PATCH 297/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c5ede0e..43114b9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,7 +108,7 @@ libssl3 libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk -libwebp 1.3.1-r0 apk +libwebp 1.3.2-r0 apk libx11 1.8.4-r4 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk From a62a72c757efe510d87c2f534e2f73bde61bcd99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Sep 2023 18:22:15 +0000 Subject: [PATCH 298/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 43114b9..99dcf86 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -80,7 +80,7 @@ libblkid libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.2-r0 apk +libcrypto3 3.1.3-r0 apk libcurl 8.2.1-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -104,7 +104,7 @@ libproc2 libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.2-r0 apk +libssl3 3.1.3-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -145,7 +145,7 @@ nunomaduro/larastan nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.2-r0 apk +openssl 3.1.3-r0 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk From 4f7bd3761e8450e67f371a9fcdc913f01eb983bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Oct 2023 18:21:57 +0000 Subject: [PATCH 299/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 99dcf86..9e413ae 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ busybox-binsh ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk -curl 8.2.1-r0 apk +curl 8.3.0-r0 apk dasprid/enum 1.0.4 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -81,7 +81,7 @@ libbsd libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.3-r0 apk -libcurl 8.2.1-r0 apk +libcurl 8.3.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk From 32c7e152fa358b1849ffbeafd7e609be8e1ba6c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 18:21:05 +0000 Subject: [PATCH 300/452] Bot Updating Templated Files --- Jenkinsfile | 77 ++++++++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3da172e..e94cba4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - SCARF_TOKEN=credentials('scarf_api_key') EXT_GIT_BRANCH = 'master' EXT_USER = 'bookstackapp' EXT_REPO = 'bookstack' @@ -339,12 +338,12 @@ pipeline { else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - mkdir -p ${TEMPDIR}/gitbook - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ - cd ${TEMPDIR}/gitbook/docker-documentation/ - git add images/docker-${CONTAINER_NAME}.md + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + git add docs/images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi @@ -435,35 +434,6 @@ pipeline { "visibility":"public"}' ''' } } - /* ####################### - Scarf.sh package registry - ####################### */ - // Add package to Scarf.sh and set permissions - stage("Scarf.sh package registry"){ - when { - branch "master" - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''#! /bin/bash - PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/bookstack") | .uuid' || :) - if [ -z "${PACKAGE_UUID}" ]; then - echo "Adding package to Scarf.sh" - curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \ - -H "Authorization: Bearer ${SCARF_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{"name":"linuxserver/bookstack",\ - "shortDescription":"example description",\ - "libraryType":"docker",\ - "website":"https://github.com/linuxserver/docker-bookstack",\ - "backendUrl":"https://ghcr.io/linuxserver/bookstack",\ - "publicUrl":"https://lscr.io/linuxserver/bookstack"}' || : - else - echo "Package already exists on Scarf.sh" - fi - ''' - } - } /* ############### Build Container ############### */ @@ -859,6 +829,41 @@ pipeline { curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } } + // Add protection to the release branch + stage('Github-Release-Branch-Protection') { + when { + branch "master" + environment name: 'CHANGE_ID', value: '' + environment name: 'EXIT_STATUS', value: '' + } + steps { + echo "Setting up protection for release branch master" + sh '''#! /bin/bash + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \ + -d $(jq -c . << EOF + { + "required_status_checks": null, + "enforce_admins": false, + "required_pull_request_reviews": { + "dismiss_stale_reviews": false, + "require_code_owner_reviews": false, + "require_last_push_approval": false, + "required_approving_review_count": 1 + }, + "restrictions": null, + "required_linear_history": false, + "allow_force_pushes": false, + "allow_deletions": false, + "block_creations": false, + "required_conversation_resolution": true, + "lock_branch": false, + "allow_fork_syncing": false, + "required_signatures": false + } +EOF + ) ''' + } + } // Use helper container to sync the current README on master to the dockerhub endpoint stage('Sync-README') { when { From 7a787f9c5b1a8d0b9afb0e444bba25ab4d69c4c2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 18:22:41 +0000 Subject: [PATCH 301/452] Bot Updating Templated Files --- README.md | 136 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 100 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index b418985..ce00633 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ -<!-- DO NOT EDIT THIS FILE MANUALLY --> -<!-- Please read the https://github.com/linuxserver/docker-bookstack/blob/master/.github/CONTRIBUTING.md --> - +<!-- DO NOT EDIT THIS FILE MANUALLY --> +<!-- Please read https://github.com/linuxserver/docker-bookstack/blob/master/.github/CONTRIBUTING.md --> [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![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!") @@ -94,7 +93,7 @@ When you create the container, do not set any arguments for any SQL settings. Th ## Usage -Here are some example snippets to help you get started creating a container. +To help you get started creating a container from this image you can either use docker-compose or the docker cli. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) @@ -135,7 +134,6 @@ services: volumes: - ./bookstack_db_data:/config restart: unless-stopped - ``` ### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) @@ -157,12 +155,11 @@ docker run -d \ -v /path/to/data:/config \ --restart unless-stopped \ lscr.io/linuxserver/bookstack:latest - ``` ## Parameters -Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. +Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container. | Parameter | Function | | :----: | --- | @@ -186,10 +183,10 @@ You can set any environment variable from a file by using a special prepend `FIL As an example: ```bash --e FILE__PASSWORD=/run/secrets/mysecretpassword +-e FILE__MYVAR=/run/secrets/mysecretvariable ``` -Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file. +Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file. ## Umask for running applications @@ -198,15 +195,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu ## User / Group Identifiers -When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. +When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic. -In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below: +In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below: ```bash - $ id username - uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup) +id your_user +``` + +Example output: + +```text +uid=1000(your_user) gid=1000(your_user) groups=1000(your_user) ``` ## Docker Mods @@ -217,12 +219,29 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Support Info -* Shell access whilst the container is running: `docker exec -it bookstack /bin/bash` -* To monitor the logs of the container in realtime: `docker logs -f bookstack` -* container version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack` -* image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bookstack:latest` +* Shell access whilst the container is running: + + ```bash + docker exec -it bookstack /bin/bash + ``` + +* To monitor the logs of the container in realtime: + + ```bash + docker logs -f bookstack + ``` + +* Container version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' bookstack + ``` + +* Image version number: + + ```bash + docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/bookstack:latest + ``` ## Updating Info @@ -232,38 +251,83 @@ Below are the instructions for updating containers: ### Via Docker Compose -* Update all images: `docker-compose pull` - * or update a single image: `docker-compose pull bookstack` -* Let compose update all containers as necessary: `docker-compose up -d` - * or update a single container: `docker-compose up -d bookstack` -* You can also remove the old dangling images: `docker image prune` +* Update images: + * All images: + + ```bash + docker-compose pull + ``` + + * Single image: + + ```bash + docker-compose pull bookstack + ``` + +* Update containers: + * All containers: + + ```bash + docker-compose up -d + ``` + + * Single container: + + ```bash + docker-compose up -d bookstack + ``` + +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/bookstack:latest` -* Stop the running container: `docker stop bookstack` -* Delete the container: `docker rm bookstack` +* Update the image: + + ```bash + docker pull lscr.io/linuxserver/bookstack:latest + ``` + +* Stop the running container: + + ```bash + docker stop bookstack + ``` + +* Delete the container: + + ```bash + docker rm bookstack + ``` + * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* You can also remove the old dangling images: `docker image prune` +* You can also remove the old dangling images: + + ```bash + docker image prune + ``` ### Via Watchtower auto-updater (only use if you don't remember the original parameters) * Pull the latest image at its tag and replace it with the same env variables in one run: - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once bookstack - ``` + ```bash + docker run --rm \ + -v /var/run/docker.sock:/var/run/docker.sock \ + containrrr/watchtower \ + --run-once bookstack + ``` * You can also remove the old dangling images: `docker image prune` -**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). +**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). ### Image Update Notifications - Diun (Docker Image Update Notifier) -* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 0b32a2a4c34532b8581979d2af56d21f7928c9d9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Oct 2023 18:26:31 +0000 Subject: [PATCH 302/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 9e413ae..066ecce 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Reads from stdin without leaking info to the terminal and outputs back to stdout alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.3-r0 apk +alpine-release 3.18.4-r0 apk aom-libs 3.6.1-r0 apk apache2-utils 2.4.57-r3 apk apk-tools 2.14.0-r2 apk From 9a4494667a85147aa54bffba8dae3eac8b542239 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Oct 2023 18:24:42 +0000 Subject: [PATCH 303/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 066ecce..e69c783 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -128,8 +128,8 @@ mkfontscale mockery/mockery 1.6.6 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.6.1 php-composer -musl 1.2.4-r1 apk -musl-utils 1.2.4-r1 apk +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk From 833d57cfed2436299ea5ce1222179e1877da7e53 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Oct 2023 18:21:00 +0000 Subject: [PATCH 304/452] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e69c783..5df65a7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data alpine-keys 2.4-r1 apk alpine-release 3.18.4-r0 apk aom-libs 3.6.1-r0 apk -apache2-utils 2.4.57-r3 apk +apache2-utils 2.4.58-r0 apk apk-tools 2.14.0-r2 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk @@ -18,12 +18,12 @@ barryvdh/laravel-snappy bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r2 apk -busybox-binsh 1.36.1-r2 apk +busybox 1.36.1-r4 apk +busybox-binsh 1.36.1-r4 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk -curl 8.3.0-r0 apk +curl 8.4.0-r0 apk dasprid/enum 1.0.4 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -81,7 +81,7 @@ libbsd libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.3-r0 apk -libcurl 8.3.0-r0 apk +libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk @@ -137,8 +137,8 @@ nesbot/carbon netcat-openbsd 1.219-r1 apk nette/schema v1.2.4 php-composer nette/utils v4.0.1 php-composer -nghttp2-libs 1.55.1-r0 apk -nginx 1.24.0-r6 apk +nghttp2-libs 1.57.0-r0 apk +nginx 1.24.0-r7 apk nikic/php-parser v4.17.1 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/larastan v2.6.4 php-composer @@ -244,7 +244,7 @@ squizlabs/php_codesniffer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r2 apk +ssl_client 1.36.1-r4 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer From 0da4f3e270706c54a57f3b964cd51e79779bd6f6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Oct 2023 12:47:46 +0000 Subject: [PATCH 305/452] Bot Updating Package Versions --- package_versions.txt | 85 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5df65a7..100b7fd 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr apr-util 1.6.3-r1 apk argon2-libs 20190702-r4 apk aws/aws-crt-php v1.2.2 php-composer -aws/aws-sdk-php 3.279.2 php-composer +aws/aws-sdk-php 3.283.8 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -24,12 +24,12 @@ ca-certificates ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk curl 8.4.0-r0 apk -dasprid/enum 1.0.4 php-composer +dasprid/enum 1.0.5 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.6.6 php-composer -doctrine/deprecations v1.1.1 php-composer +doctrine/dbal 3.7.1 php-composer +doctrine/deprecations 1.1.2 php-composer doctrine/event-manager 1.2.0 php-composer doctrine/inflector 2.0.8 php-composer doctrine/instantiator 1.5.0 php-composer @@ -43,34 +43,34 @@ filp/whoops font-freefont 20120503-r4 apk fontconfig 2.14.2-r3 apk freetype 2.13.0-r5 apk -fruitcake/php-cors v1.2.0 php-composer +fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk git 2.40.1-r0 apk git-perl 2.40.1-r0 apk glib 2.76.4-r0 apk graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.7.0 php-composer +guzzlehttp/guzzle 7.8.0 php-composer guzzlehttp/promises 2.0.1 php-composer -guzzlehttp/psr7 2.6.0 php-composer -guzzlehttp/uri-template v1.0.1 php-composer +guzzlehttp/psr7 2.6.1 php-composer +guzzlehttp/uri-template v1.0.2 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 73.2-r2 apk icu-libs 73.2-r2 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.6-r3 apk -knplabs/knp-snappy v1.4.2 php-composer -laravel/framework v9.52.15 php-composer +knplabs/knp-snappy v1.4.4 php-composer +laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.1 php-composer -laravel/socialite v5.8.0 php-composer -laravel/tinker v2.8.1 php-composer -league/commonmark 2.4.0 php-composer +laravel/socialite v5.9.1 php-composer +laravel/tinker v2.8.2 php-composer +league/commonmark 2.4.1 php-composer league/config v1.2.0 php-composer -league/flysystem 3.15.1 php-composer -league/flysystem-aws-s3-v3 3.15.0 php-composer -league/flysystem-local 3.15.0 php-composer +league/flysystem 3.17.0 php-composer +league/flysystem-aws-s3-v3 3.16.0 php-composer +league/flysystem-local 3.16.0 php-composer league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.13.0 php-composer +league/mime-type-detection 1.14.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer libacl 2.3.1-r3 apk @@ -80,7 +80,7 @@ libblkid libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.3-r0 apk +libcrypto3 3.1.4-r0 apk libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -104,7 +104,7 @@ libproc2 libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.3-r0 apk +libssl3 3.1.4-r0 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -127,16 +127,16 @@ memcached mkfontscale 1.2.2-r3 apk mockery/mockery 1.6.6 php-composer monolog/monolog 2.9.1 php-composer -mtdowling/jmespath.php 2.6.1 php-composer +mtdowling/jmespath.php 2.7.0 php-composer musl 1.2.4-r2 apk musl-utils 1.2.4-r2 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.69.0 php-composer +nesbot/carbon 2.71.0 php-composer netcat-openbsd 1.219-r1 apk -nette/schema v1.2.4 php-composer -nette/utils v4.0.1 php-composer +nette/schema v1.2.5 php-composer +nette/utils v4.0.2 php-composer nghttp2-libs 1.57.0-r0 apk nginx 1.24.0-r7 apk nikic/php-parser v4.17.1 php-composer @@ -145,7 +145,7 @@ nunomaduro/larastan nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.3-r0 apk +openssl 3.1.4-r0 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -183,30 +183,30 @@ php82-tokenizer php82-xml 8.2.10-r0 apk php82-xmlwriter 8.2.10-r0 apk php82-zip 8.2.10-r0 apk -phpmyadmin/sql-parser 5.8.0 php-composer +phpmyadmin/sql-parser 5.8.2 php-composer phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.21 php-composer -phpstan/phpstan 1.10.29 php-composer -phpunit/php-code-coverage 9.2.27 php-composer +phpseclib/phpseclib 3.0.23 php-composer +phpstan/phpstan 1.10.39 php-composer +phpunit/php-code-coverage 9.2.29 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.11 php-composer +phpunit/phpunit 9.6.13 php-composer popt 1.19-r2 apk pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.1 php-composer +predis/predis v2.2.2 php-composer procps-ng 4.0.4-r0 apk psr/cache 3.0.0 php-composer psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.2 php-composer +psr/http-client 1.0.3 php-composer psr/http-factory 1.0.2 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.20 php-composer +psy/psysh v0.11.22 php-composer qt5-qtbase 5.15.9_git20230505-r0 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer @@ -235,10 +235,9 @@ shadow skalibs 2.13.1.1-r1 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.3.0 php-composer +socialiteproviders/manager v4.4.0 php-composer socialiteproviders/microsoft-azure 5.1.0 php-composer socialiteproviders/okta 4.3.0 php-composer -socialiteproviders/slack 4.1.1 php-composer socialiteproviders/twitch 5.3.1 php-composer squizlabs/php_codesniffer 3.7.2 php-composer ssddanbrown/asserthtml v2.0.0 php-composer @@ -256,15 +255,15 @@ symfony/finder symfony/http-foundation v6.0.20 php-composer symfony/http-kernel v6.0.20 php-composer symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.27.0 php-composer -symfony/polyfill-intl-grapheme v1.27.0 php-composer -symfony/polyfill-intl-idn v1.27.0 php-composer -symfony/polyfill-intl-normalizer v1.27.0 php-composer -symfony/polyfill-mbstring v1.27.0 php-composer -symfony/polyfill-php72 v1.27.0 php-composer -symfony/polyfill-php80 v1.27.0 php-composer -symfony/polyfill-php81 v1.27.0 php-composer -symfony/polyfill-uuid v1.27.0 php-composer +symfony/polyfill-ctype v1.28.0 php-composer +symfony/polyfill-intl-grapheme v1.28.0 php-composer +symfony/polyfill-intl-idn v1.28.0 php-composer +symfony/polyfill-intl-normalizer v1.28.0 php-composer +symfony/polyfill-mbstring v1.28.0 php-composer +symfony/polyfill-php72 v1.28.0 php-composer +symfony/polyfill-php80 v1.28.0 php-composer +symfony/polyfill-php81 v1.28.0 php-composer +symfony/polyfill-uuid v1.28.0 php-composer symfony/process v6.0.19 php-composer symfony/routing v6.0.19 php-composer symfony/service-contracts v3.0.2 php-composer From e0f1e7cf138f64062060f43edff53ce646b441a5 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:35:24 -0400 Subject: [PATCH 306/452] further sanitize sed replace --- readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 4ebd797..4c988e4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "31.10.23:", desc: "Further sanitize sed replace." } - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 1b683e6..6c1b78d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -86,9 +86,12 @@ if [[ -n "${DB_HOST}" ]]; then sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST='${DB_HOST}'/g" /config/www/.env sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT='${DB_PORT}'/g" /config/www/.env - sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE='${DB_DATABASE}'/g" /config/www/.env - sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME='${DB_USER}'/g" /config/www/.env - sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD='${DB_PASS//&/\\&}'/g" /config/www/.env + SED_DB_DATABASE=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_DATABASE}") + sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE='${SED_DB_DATABASE}'/g" /config/www/.env + SED_DB_USER=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_USER}") + sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME='${SED_DB_USER}'/g" /config/www/.env + SED_DB_PASS=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_PASS}") + sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD='${SED_DB_PASS}'/g" /config/www/.env fi # set appurl From b9909c9323394cc39a544ae71c29a6f5871f5188 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 2 Nov 2023 15:29:16 +0000 Subject: [PATCH 307/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 100b7fd..1aba0d7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -109,7 +109,7 @@ libstdc++ libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk libwebp 1.3.2-r0 apk -libx11 1.8.4-r4 apk +libx11 1.8.7-r0 apk libxau 1.0.11-r2 apk libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk From 99e2bec1bc7484d660f7a1a55a40347cefbd22d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 Nov 2023 18:21:49 +0000 Subject: [PATCH 308/452] Bot Updating Package Versions --- package_versions.txt | 568 +++++++++++++++++++++---------------------- 1 file changed, 284 insertions(+), 284 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1aba0d7..343b7ea 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,284 +1,284 @@ -NAME VERSION TYPE -Reads from stdin without leaking info to the terminal and outputs back to stdout 1, 0, 0, 0 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.4-r0 apk -aom-libs 3.6.1-r0 apk -apache2-utils 2.4.58-r0 apk -apk-tools 2.14.0-r2 apk -apr 1.7.4-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r4 apk -aws/aws-crt-php v1.2.2 php-composer -aws/aws-sdk-php 3.283.8 php-composer -bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.15-r5 apk -brick/math 0.11.0 php-composer -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r4 apk -busybox-binsh 1.36.1-r4 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -coreutils 9.3-r1 apk -curl 8.4.0-r0 apk -dasprid/enum 1.0.5 php-composer -dbus-libs 1.14.8-r0 apk -dflydev/dot-access-data v3.0.2 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.7.1 php-composer -doctrine/deprecations 1.1.2 php-composer -doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.8 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.0 php-composer -dompdf/dompdf v2.0.3 php-composer -dragonmantank/cron-expression v3.3.3 php-composer -egulias/email-validator 3.2.6 php-composer -encodings 1.0.7-r1 apk -fakerphp/faker v1.23.0 php-composer -filp/whoops 2.15.3 php-composer -font-freefont 20120503-r4 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fruitcake/php-cors v1.3.0 php-composer -gdbm 1.23-r1 apk -git 2.40.1-r0 apk -git-perl 2.40.1-r0 apk -glib 2.76.4-r0 apk -graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.8.0 php-composer -guzzlehttp/promises 2.0.1 php-composer -guzzlehttp/psr7 2.6.1 php-composer -guzzlehttp/uri-template v1.0.2 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r2 apk -icu-libs 73.2-r2 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r3 apk -knplabs/knp-snappy v1.4.4 php-composer -laravel/framework v9.52.16 php-composer -laravel/serializable-closure v1.3.1 php-composer -laravel/socialite v5.9.1 php-composer -laravel/tinker v2.8.2 php-composer -league/commonmark 2.4.1 php-composer -league/config v1.2.0 php-composer -league/flysystem 3.17.0 php-composer -league/flysystem-aws-s3-v3 3.16.0 php-composer -league/flysystem-local 3.16.0 php-composer -league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.14.0 php-composer -league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r3 apk -libattr 2.5.1-r4 apk -libavif 0.11.1-r2 apk -libblkid 2.38.1-r8 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r0 apk -libcurl 8.4.0-r0 apk -libdav1d 1.2.1-r0 apk -libedit 20221030.3.1-r1 apk -libevent 2.1.12-r6 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libfontenc 1.1.7-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libice 1.1.1-r2 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.5-r0 apk -libmd 1.0.4-r2 apk -libmemcached-libs 1.1.4-r1 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libpcre2-16 10.42-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libsasl 2.1.28-r4 apk -libseccomp 2.5.4-r2 apk -libsm 1.2.4-r1 apk -libssl3 3.1.4-r0 apk -libstdc++ 12.2.1_git20220924-r10 apk -libunistring 1.1-r1 apk -libuuid 2.38.1-r8 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxml2 2.11.4-r0 apk -libxpm 3.5.16-r1 apk -libxt 1.3.0-r2 apk -libzip 1.9.2-r2 apk -linux-pam 1.5.2-r10 apk -logrotate 3.21.0-r1 apk -mariadb-client 10.11.5-r0 apk -mariadb-common 10.11.5-r0 apk -masterminds/html5 2.8.1 php-composer -memcached 1.6.21-r0 apk -mkfontscale 1.2.2-r3 apk -mockery/mockery 1.6.6 php-composer -monolog/monolog 2.9.1 php-composer -mtdowling/jmespath.php 2.7.0 php-composer -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -myclabs/deep-copy 1.11.1 php-composer -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.71.0 php-composer -netcat-openbsd 1.219-r1 apk -nette/schema v1.2.5 php-composer -nette/utils v4.0.2 php-composer -nghttp2-libs 1.57.0-r0 apk -nginx 1.24.0-r7 apk -nikic/php-parser v4.17.1 php-composer -nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.4 php-composer -nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.8-r1 apk -openssl 3.1.4-r0 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r3 apk -pcre2 10.42-r1 apk -perl 5.36.1-r2 apk -perl-error 0.17029-r1 apk -perl-git 2.40.1-r0 apk -phar-io/manifest 2.0.3 php-composer -phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.4 php-composer -phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.10-r0 apk -php82-common 8.2.10-r0 apk -php82-ctype 8.2.10-r0 apk -php82-curl 8.2.10-r0 apk -php82-dom 8.2.10-r0 apk -php82-fileinfo 8.2.10-r0 apk -php82-fpm 8.2.10-r0 apk -php82-gd 8.2.10-r0 apk -php82-iconv 8.2.10-r0 apk -php82-ldap 8.2.10-r0 apk -php82-mbstring 8.2.10-r0 apk -php82-mysqlnd 8.2.10-r0 apk -php82-openssl 8.2.10-r0 apk -php82-pdo 8.2.10-r0 apk -php82-pdo_mysql 8.2.10-r0 apk -php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-memcached 3.2.0-r1 apk -php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.10-r0 apk -php82-session 8.2.10-r0 apk -php82-simplexml 8.2.10-r0 apk -php82-sockets 8.2.10-r0 apk -php82-tokenizer 8.2.10-r0 apk -php82-xml 8.2.10-r0 apk -php82-xmlwriter 8.2.10-r0 apk -php82-zip 8.2.10-r0 apk -phpmyadmin/sql-parser 5.8.2 php-composer -phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.23 php-composer -phpstan/phpstan 1.10.39 php-composer -phpunit/php-code-coverage 9.2.29 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.13 php-composer -popt 1.19-r2 apk -pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.2 php-composer -procps-ng 4.0.4-r0 apk -psr/cache 3.0.0 php-composer -psr/clock 1.0.0 php-composer -psr/container 2.0.2 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.3 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer -psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.22 php-composer -qt5-qtbase 5.15.9_git20230505-r0 apk -ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.4 php-composer -readline 8.2.1-r1 apk -robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser 8.4.0 php-composer -scanelf 1.3.7-r1 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.2 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.6 php-composer -sebastian/lines-of-code 1.0.3 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -socialiteproviders/discord 4.2.0 php-composer -socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.4.0 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.3.0 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.7.2 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r4 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.28.0 php-composer -symfony/polyfill-intl-grapheme v1.28.0 php-composer -symfony/polyfill-intl-idn v1.28.0 php-composer -symfony/polyfill-intl-normalizer v1.28.0 php-composer -symfony/polyfill-mbstring v1.28.0 php-composer -symfony/polyfill-php72 v1.28.0 php-composer -symfony/polyfill-php80 v1.28.0 php-composer -symfony/polyfill-php81 v1.28.0 php-composer -symfony/polyfill-uuid v1.28.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.1 php-composer -tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -vlucas/phpdotenv v5.5.0 php-composer -voku/portable-ascii 2.0.1 php-composer -webmozart/assert 1.11.0 php-composer -xz-libs 5.4.3-r0 apk -zlib 1.2.13-r1 apk -zstd-libs 1.5.5-r4 apk +NAME VERSION TYPE +Readsfromstdinwithoutleakinginfototheterminalandoutputsbacktostdout 1, dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.4-r0 apk +aom-libs 3.6.1-r0 apk +apache2-utils 2.4.58-r0 apk +apk-tools 2.14.0-r2 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r4 apk +aws/aws-crt-php v1.2.2 php-composer +aws/aws-sdk-php 3.283.8 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer +bash 5.2.15-r5 apk +brick/math 0.11.0 php-composer +brotli-libs 1.0.9-r14 apk +busybox 1.36.1-r4 apk +busybox-binsh 1.36.1-r4 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +coreutils 9.3-r1 apk +curl 8.4.0-r0 apk +dasprid/enum 1.0.5 php-composer +dbus-libs 1.14.8-r0 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.7.1 php-composer +doctrine/deprecations 1.1.2 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.8 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.0 php-composer +dompdf/dompdf v2.0.3 php-composer +dragonmantank/cron-expression v3.3.3 php-composer +egulias/email-validator 3.2.6 php-composer +encodings 1.0.7-r1 apk +fakerphp/faker v1.23.0 php-composer +filp/whoops 2.15.3 php-composer +font-freefont 20120503-r4 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fruitcake/php-cors v1.3.0 php-composer +gdbm 1.23-r1 apk +git 2.40.1-r0 apk +git-perl 2.40.1-r0 apk +glib 2.76.4-r0 apk +graham-campbell/result-type v1.1.1 php-composer +guzzlehttp/guzzle 7.8.0 php-composer +guzzlehttp/promises 2.0.1 php-composer +guzzlehttp/psr7 2.6.1 php-composer +guzzlehttp/uri-template v1.0.2 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +icu-data-full 73.2-r2 apk +icu-libs 73.2-r2 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.1.12 php-composer +jq 1.6-r3 apk +knplabs/knp-snappy v1.4.4 php-composer +laravel/framework v9.52.16 php-composer +laravel/serializable-closure v1.3.1 php-composer +laravel/socialite v5.9.1 php-composer +laravel/tinker v2.8.2 php-composer +league/commonmark 2.4.1 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.17.0 php-composer +league/flysystem-aws-s3-v3 3.16.0 php-composer +league/flysystem-local 3.16.0 php-composer +league/html-to-markdown 5.1.1 php-composer +league/mime-type-detection 1.14.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.7.0 php-composer +libacl 2.3.1-r3 apk +libattr 2.5.1-r4 apk +libavif 0.11.1-r2 apk +libblkid 2.38.1-r8 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r0 apk +libcurl 8.4.0-r0 apk +libdav1d 1.2.1-r0 apk +libedit 20221030.3.1-r1 apk +libevent 2.1.12-r6 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libfontenc 1.1.7-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libice 1.1.1-r2 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libldap 2.6.5-r0 apk +libmd 1.0.4-r2 apk +libmemcached-libs 1.1.4-r1 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libpcre2-16 10.42-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.4-r0 apk +libsasl 2.1.28-r4 apk +libseccomp 2.5.4-r2 apk +libsm 1.2.4-r1 apk +libssl3 3.1.4-r0 apk +libstdc++ 12.2.1_git20220924-r10 apk +libunistring 1.1-r1 apk +libuuid 2.38.1-r8 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxml2 2.11.4-r0 apk +libxpm 3.5.16-r1 apk +libxt 1.3.0-r2 apk +libzip 1.9.2-r2 apk +linux-pam 1.5.2-r10 apk +logrotate 3.21.0-r1 apk +mariadb-client 10.11.5-r0 apk +mariadb-common 10.11.5-r0 apk +masterminds/html5 2.8.1 php-composer +memcached 1.6.21-r0 apk +mkfontscale 1.2.2-r3 apk +mockery/mockery 1.6.6 php-composer +monolog/monolog 2.9.1 php-composer +mtdowling/jmespath.php 2.7.0 php-composer +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk +myclabs/deep-copy 1.11.1 php-composer +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +nesbot/carbon 2.71.0 php-composer +netcat-openbsd 1.219-r1 apk +nette/schema v1.2.5 php-composer +nette/utils v4.0.2 php-composer +nghttp2-libs 1.57.0-r0 apk +nginx 1.24.0-r7 apk +nikic/php-parser v4.17.1 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/larastan v2.6.4 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.8-r1 apk +openssl 3.1.4-r0 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r1 apk +perl 5.36.1-r2 apk +perl-error 0.17029-r1 apk +perl-git 2.40.1-r0 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.4 php-composer +phenx/php-svg-lib 0.5.0 php-composer +php82 8.2.12-r0 apk +php82-common 8.2.12-r0 apk +php82-ctype 8.2.12-r0 apk +php82-curl 8.2.12-r0 apk +php82-dom 8.2.12-r0 apk +php82-fileinfo 8.2.12-r0 apk +php82-fpm 8.2.12-r0 apk +php82-gd 8.2.12-r0 apk +php82-iconv 8.2.12-r0 apk +php82-ldap 8.2.12-r0 apk +php82-mbstring 8.2.12-r0 apk +php82-mysqlnd 8.2.12-r0 apk +php82-openssl 8.2.12-r0 apk +php82-pdo 8.2.12-r0 apk +php82-pdo_mysql 8.2.12-r0 apk +php82-pecl-igbinary 3.2.14-r0 apk +php82-pecl-memcached 3.2.0-r1 apk +php82-pecl-msgpack 2.2.0-r0 apk +php82-phar 8.2.12-r0 apk +php82-session 8.2.12-r0 apk +php82-simplexml 8.2.12-r0 apk +php82-sockets 8.2.12-r0 apk +php82-tokenizer 8.2.12-r0 apk +php82-xml 8.2.12-r0 apk +php82-xmlwriter 8.2.12-r0 apk +php82-zip 8.2.12-r0 apk +phpmyadmin/sql-parser 5.8.2 php-composer +phpoption/phpoption 1.9.1 php-composer +phpseclib/phpseclib 3.0.23 php-composer +phpstan/phpstan 1.10.39 php-composer +phpunit/php-code-coverage 9.2.29 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.13 php-composer +popt 1.19-r2 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.2.2 php-composer +procps-ng 4.0.4-r0 apk +psr/cache 3.0.0 php-composer +psr/clock 1.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.3 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.11.22 php-composer +qt5-qtbase 5.15.9_git20230505-r0 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.4 php-composer +readline 8.2.1-r1 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser 8.4.0 php-composer +scanelf 1.3.7-r1 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.2 php-composer +sebastian/diff 4.0.5 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.6 php-composer +sebastian/lines-of-code 1.0.3 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +socialiteproviders/discord 4.2.0 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.4.0 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.3.0 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.7.2 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssddanbrown/symfony-mailer 6.0.x-dev php-composer +ssl_client 1.36.1-r4 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.28.0 php-composer +symfony/polyfill-intl-grapheme v1.28.0 php-composer +symfony/polyfill-intl-idn v1.28.0 php-composer +symfony/polyfill-intl-normalizer v1.28.0 php-composer +symfony/polyfill-mbstring v1.28.0 php-composer +symfony/polyfill-php72 v1.28.0 php-composer +symfony/polyfill-php80 v1.28.0 php-composer +symfony/polyfill-php81 v1.28.0 php-composer +symfony/polyfill-uuid v1.28.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.1 php-composer +tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +vlucas/phpdotenv v5.5.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz-libs 5.4.3-r0 apk +zlib 1.2.13-r1 apk +zstd-libs 1.5.5-r4 apk From 40ee80c5d8957ebdb058a8ac7fe14ad14424f435 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 17 Nov 2023 15:53:15 +0000 Subject: [PATCH 309/452] Bot Updating Templated Files --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ce00633..826c1e2 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ For more information on BookStack visit their website and check it out: https:// ## Supported Architectures -We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). Simply pulling `lscr.io/linuxserver/bookstack:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. @@ -352,6 +352,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.10.23:** - Further sanitize sed replace. * **07.06.23:** - Add mariadb-client for bookstack-system-cli support. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **13.04.23:** - Move ssl.conf include to default.conf. From acda76ad08ddc8b69efbaaf92b6ee679b39b70fe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 17 Nov 2023 15:56:12 +0000 Subject: [PATCH 310/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 343b7ea..ae4d872 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,8 +18,8 @@ barryvdh/laravel-snappy v1.0.2 bash 5.2.15-r5 apk brick/math 0.11.0 php-composer brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r4 apk -busybox-binsh 1.36.1-r4 apk +busybox 1.36.1-r5 apk +busybox-binsh 1.36.1-r5 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk @@ -80,7 +80,7 @@ libblkid 2.38.1-r8 libbsd 0.11.7-r1 apk libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r0 apk +libcrypto3 3.1.4-r1 apk libcurl 8.4.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk @@ -104,7 +104,7 @@ libproc2 4.0.4-r0 libsasl 2.1.28-r4 apk libseccomp 2.5.4-r2 apk libsm 1.2.4-r1 apk -libssl3 3.1.4-r0 apk +libssl3 3.1.4-r1 apk libstdc++ 12.2.1_git20220924-r10 apk libunistring 1.1-r1 apk libuuid 2.38.1-r8 apk @@ -145,7 +145,7 @@ nunomaduro/larastan v2.6.4 nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.8-r1 apk -openssl 3.1.4-r0 apk +openssl 3.1.4-r1 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -243,7 +243,7 @@ squizlabs/php_codesniffer 3.7.2 ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r4 apk +ssl_client 1.36.1-r5 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer From 7759d52c2503e0357cc2a042f3441fb465e8120a Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 24 Nov 2023 13:54:02 +0000 Subject: [PATCH 311/452] Symlink all logs to avoid defer error on new install --- root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 6c1b78d..703e042 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,7 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes,backups} + /config/www/{uploads,files,images,themes,backups,logs} # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -14,11 +14,11 @@ fi symlinks=( /app/www/themes /app/www/storage/backups + /app/www/storage/logs /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads /app/www/.env - /app/www/storage/logs/laravel.log ) for i in "${symlinks[@]}"; do From 78d685a31f47de8708c037d76c89e4cf7856c734 Mon Sep 17 00:00:00 2001 From: TheSpad <git@spad.co.uk> Date: Fri, 24 Nov 2023 14:11:04 +0000 Subject: [PATCH 312/452] Symlink logs and backups outside of www --- .../s6-rc.d/init-bookstack-config/run | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 703e042..39aa3bf 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,9 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes,backups,logs} + /config/www/{uploads,files,images,themes} \ + /config/backups \ + /config/log/bookstack # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -13,8 +15,6 @@ fi # create symlinks symlinks=( /app/www/themes - /app/www/storage/backups - /app/www/storage/logs /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads @@ -30,6 +30,20 @@ for i in "${symlinks[@]}"; do fi done +if [[ -e "/app/www/storage/backups" && ! -L "/app/www/storage/backups" ]]; then + rm -rf "/app/www/storage/backups" +fi +if [[ ! -L "/app/www/storage/backups" ]]; then + ln -s "/config/backups" "/app/www/storage/backups" +fi + +if [[ -e "/app/www/storage/logs" && ! -L "/app/www/storage/logs" ]]; then + rm -rf "/app/www/storage/logs" +fi +if [[ ! -L "/app/www/storage/logs" ]]; then + ln -s "/config/log/bookstack" "/app/www/storage/logs" +fi + # Echo init finish for test runs if [ -n "${TEST_RUN}" ]; then echo '[ls.io-init] done.' From 152f64b6f979397bdd0eb5fea0ce48985e662a77 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 25 Nov 2023 12:18:06 +0000 Subject: [PATCH 313/452] Bot Updating Package Versions --- package_versions.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ae4d872..1088fdc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -114,7 +114,7 @@ libxau 1.0.11-r2 libxcb 1.15-r1 apk libxdmcp 1.1.4-r2 apk libxext 1.3.5-r2 apk -libxml2 2.11.4-r0 apk +libxml2 2.11.6-r0 apk libxpm 3.5.16-r1 apk libxt 1.3.0-r2 apk libzip 1.9.2-r2 apk @@ -161,25 +161,25 @@ php82 8.2.12-r0 php82-common 8.2.12-r0 apk php82-ctype 8.2.12-r0 apk php82-curl 8.2.12-r0 apk -php82-dom 8.2.12-r0 apk +php82-dom 8.2.13-r0 apk php82-fileinfo 8.2.12-r0 apk php82-fpm 8.2.12-r0 apk -php82-gd 8.2.12-r0 apk +php82-gd 8.2.13-r0 apk php82-iconv 8.2.12-r0 apk -php82-ldap 8.2.12-r0 apk +php82-ldap 8.2.13-r0 apk php82-mbstring 8.2.12-r0 apk -php82-mysqlnd 8.2.12-r0 apk +php82-mysqlnd 8.2.13-r0 apk php82-openssl 8.2.12-r0 apk -php82-pdo 8.2.12-r0 apk -php82-pdo_mysql 8.2.12-r0 apk +php82-pdo 8.2.13-r0 apk +php82-pdo_mysql 8.2.13-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk php82-phar 8.2.12-r0 apk php82-session 8.2.12-r0 apk php82-simplexml 8.2.12-r0 apk -php82-sockets 8.2.12-r0 apk -php82-tokenizer 8.2.12-r0 apk +php82-sockets 8.2.13-r0 apk +php82-tokenizer 8.2.13-r0 apk php82-xml 8.2.12-r0 apk php82-xmlwriter 8.2.12-r0 apk php82-zip 8.2.12-r0 apk From a6801f27f0378b76d4c86a1e2ed1a0411723d4d0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sat, 25 Nov 2023 10:42:40 -0600 Subject: [PATCH 314/452] only run migration if conf exists redirect stderr to /dev/null Signed-off-by: Eric Nemchik <eric@nemchik.com> --- root/migrations/02-default-location | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location index 7347d24..42407f9 100644 --- a/root/migrations/02-default-location +++ b/root/migrations/02-default-location @@ -5,7 +5,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf" OLD_ROOT="root /var/www/html/public;" NEW_ROOT="root /app/www/public;" -if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}"; then +if [[ -f "${DEFAULT_CONF}" ]] && grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then echo "updating root in ${DEFAULT_CONF}" sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" fi From c645e46843f56521c3a59f19a3d06200b4f0412c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 Nov 2023 18:22:06 +0000 Subject: [PATCH 315/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1088fdc..f4129d7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -150,7 +150,7 @@ paragonie/constant_time_encoding v2.6.3 paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk pcre2 10.42-r1 apk -perl 5.36.1-r2 apk +perl 5.36.2-r0 apk perl-error 0.17029-r1 apk perl-git 2.40.1-r0 apk phar-io/manifest 2.0.3 php-composer From 1a0feb718cb852097ef93907c99dce2843ec105e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Dec 2023 18:23:33 +0000 Subject: [PATCH 316/452] Bot Updating Package Versions --- package_versions.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f4129d7..3d9f039 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -157,32 +157,32 @@ phar-io/manifest 2.0.3 phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.12-r0 apk -php82-common 8.2.12-r0 apk -php82-ctype 8.2.12-r0 apk -php82-curl 8.2.12-r0 apk +php82 8.2.13-r0 apk +php82-common 8.2.13-r0 apk +php82-ctype 8.2.13-r0 apk +php82-curl 8.2.13-r0 apk php82-dom 8.2.13-r0 apk -php82-fileinfo 8.2.12-r0 apk -php82-fpm 8.2.12-r0 apk +php82-fileinfo 8.2.13-r0 apk +php82-fpm 8.2.13-r0 apk php82-gd 8.2.13-r0 apk -php82-iconv 8.2.12-r0 apk +php82-iconv 8.2.13-r0 apk php82-ldap 8.2.13-r0 apk -php82-mbstring 8.2.12-r0 apk +php82-mbstring 8.2.13-r0 apk php82-mysqlnd 8.2.13-r0 apk -php82-openssl 8.2.12-r0 apk +php82-openssl 8.2.13-r0 apk php82-pdo 8.2.13-r0 apk php82-pdo_mysql 8.2.13-r0 apk php82-pecl-igbinary 3.2.14-r0 apk php82-pecl-memcached 3.2.0-r1 apk php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.12-r0 apk -php82-session 8.2.12-r0 apk -php82-simplexml 8.2.12-r0 apk +php82-phar 8.2.13-r0 apk +php82-session 8.2.13-r0 apk +php82-simplexml 8.2.13-r0 apk php82-sockets 8.2.13-r0 apk php82-tokenizer 8.2.13-r0 apk -php82-xml 8.2.12-r0 apk -php82-xmlwriter 8.2.12-r0 apk -php82-zip 8.2.12-r0 apk +php82-xml 8.2.13-r0 apk +php82-xmlwriter 8.2.13-r0 apk +php82-zip 8.2.13-r0 apk phpmyadmin/sql-parser 5.8.2 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.23 php-composer From ca614519d428087d9117929eac90e0e397635fc7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Dec 2023 18:23:46 +0000 Subject: [PATCH 317/452] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3d9f039..7e6b762 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Readsfromstdinwithoutleakinginfototheterminalandoutputsbacktostdout 1, alpine-baselayout 3.4.3-r1 apk alpine-baselayout-data 3.4.3-r1 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.4-r0 apk +alpine-release 3.18.5-r0 apk aom-libs 3.6.1-r0 apk apache2-utils 2.4.58-r0 apk apk-tools 2.14.0-r2 apk @@ -23,7 +23,7 @@ busybox-binsh 1.36.1-r5 ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk coreutils 9.3-r1 apk -curl 8.4.0-r0 apk +curl 8.5.0-r0 apk dasprid/enum 1.0.5 php-composer dbus-libs 1.14.8-r0 apk dflydev/dot-access-data v3.0.2 php-composer @@ -58,7 +58,7 @@ icu-data-full 73.2-r2 icu-libs 73.2-r2 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r3 apk +jq 1.6-r4 apk knplabs/knp-snappy v1.4.4 php-composer laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.1 php-composer @@ -81,7 +81,7 @@ libbsd 0.11.7-r1 libbz2 1.0.8-r5 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.4-r1 apk -libcurl 8.4.0-r0 apk +libcurl 8.5.0-r0 apk libdav1d 1.2.1-r0 apk libedit 20221030.3.1-r1 apk libevent 2.1.12-r6 apk From ba22acfa48ad3275cadadf6797fde8db5b50cd86 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Sat, 23 Dec 2023 18:08:37 -0600 Subject: [PATCH 318/452] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com> --- Dockerfile | 22 +++++++++++----------- Dockerfile.aarch64 | 22 +++++++++++----------- readme-vars.yml | 3 ++- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 866abf6..84e3782 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 # set version label ARG BUILD_DATE @@ -17,19 +17,19 @@ RUN \ fontconfig \ mariadb-client \ memcached \ - php82-dom \ - php82-gd \ - php82-ldap \ - php82-mysqlnd \ - php82-pdo_mysql \ - php82-pecl-memcached \ - php82-tokenizer \ + php83-dom \ + php83-gd \ + php83-ldap \ + php83-mysqlnd \ + php83-pdo_mysql \ + php83-pecl-memcached \ + php83-tokenizer \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ - 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 && \ + 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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8502dee..b67840a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -17,19 +17,19 @@ RUN \ fontconfig \ mariadb-client \ memcached \ - php82-dom \ - php82-gd \ - php82-ldap \ - php82-mysqlnd \ - php82-pdo_mysql \ - php82-pecl-memcached \ - php82-tokenizer \ + php83-dom \ + php83-gd \ + php83-ldap \ + php83-mysqlnd \ + php83-pdo_mysql \ + php83-pecl-memcached \ + php83-tokenizer \ qt5-qtbase \ ttf-freefont && \ echo "**** configure php-fpm to pass env vars ****" && \ - 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 && \ + 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 && \ echo "**** fetch bookstack ****" && \ mkdir -p\ /app/www && \ diff --git a/readme-vars.yml b/readme-vars.yml index 4c988e4..b1b2615 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -21,7 +21,7 @@ available_architectures: param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store any uploaded data on the docker host" } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_env: true param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "31.10.23:", desc: "Further sanitize sed replace." } - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } From 92901fa2a377d1786b8bcea554bdc3de05e40b45 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Dec 2023 18:21:56 +0000 Subject: [PATCH 319/452] Bot Updating Package Versions --- package_versions.txt | 569 ++++++++++++++++++++++--------------------- 1 file changed, 285 insertions(+), 284 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7e6b762..776152a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,284 +1,285 @@ -NAME VERSION TYPE -Readsfromstdinwithoutleakinginfototheterminalandoutputsbacktostdout 1, dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk -alpine-keys 2.4-r1 apk -alpine-release 3.18.5-r0 apk -aom-libs 3.6.1-r0 apk -apache2-utils 2.4.58-r0 apk -apk-tools 2.14.0-r2 apk -apr 1.7.4-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r4 apk -aws/aws-crt-php v1.2.2 php-composer -aws/aws-sdk-php 3.283.8 php-composer -bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.15-r5 apk -brick/math 0.11.0 php-composer -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r5 apk -busybox-binsh 1.36.1-r5 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -coreutils 9.3-r1 apk -curl 8.5.0-r0 apk -dasprid/enum 1.0.5 php-composer -dbus-libs 1.14.8-r0 apk -dflydev/dot-access-data v3.0.2 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.7.1 php-composer -doctrine/deprecations 1.1.2 php-composer -doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.8 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.0 php-composer -dompdf/dompdf v2.0.3 php-composer -dragonmantank/cron-expression v3.3.3 php-composer -egulias/email-validator 3.2.6 php-composer -encodings 1.0.7-r1 apk -fakerphp/faker v1.23.0 php-composer -filp/whoops 2.15.3 php-composer -font-freefont 20120503-r4 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk -fruitcake/php-cors v1.3.0 php-composer -gdbm 1.23-r1 apk -git 2.40.1-r0 apk -git-perl 2.40.1-r0 apk -glib 2.76.4-r0 apk -graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.8.0 php-composer -guzzlehttp/promises 2.0.1 php-composer -guzzlehttp/psr7 2.6.1 php-composer -guzzlehttp/uri-template v1.0.2 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r2 apk -icu-libs 73.2-r2 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r4 apk -knplabs/knp-snappy v1.4.4 php-composer -laravel/framework v9.52.16 php-composer -laravel/serializable-closure v1.3.1 php-composer -laravel/socialite v5.9.1 php-composer -laravel/tinker v2.8.2 php-composer -league/commonmark 2.4.1 php-composer -league/config v1.2.0 php-composer -league/flysystem 3.17.0 php-composer -league/flysystem-aws-s3-v3 3.16.0 php-composer -league/flysystem-local 3.16.0 php-composer -league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.14.0 php-composer -league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r3 apk -libattr 2.5.1-r4 apk -libavif 0.11.1-r2 apk -libblkid 2.38.1-r8 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r1 apk -libcurl 8.5.0-r0 apk -libdav1d 1.2.1-r0 apk -libedit 20221030.3.1-r1 apk -libevent 2.1.12-r6 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libfontenc 1.1.7-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libice 1.1.1-r2 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.5-r0 apk -libmd 1.0.4-r2 apk -libmemcached-libs 1.1.4-r1 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libpcre2-16 10.42-r1 apk -libpng 1.6.39-r3 apk -libproc2 4.0.4-r0 apk -libsasl 2.1.28-r4 apk -libseccomp 2.5.4-r2 apk -libsm 1.2.4-r1 apk -libssl3 3.1.4-r1 apk -libstdc++ 12.2.1_git20220924-r10 apk -libunistring 1.1-r1 apk -libuuid 2.38.1-r8 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk -libxml2 2.11.6-r0 apk -libxpm 3.5.16-r1 apk -libxt 1.3.0-r2 apk -libzip 1.9.2-r2 apk -linux-pam 1.5.2-r10 apk -logrotate 3.21.0-r1 apk -mariadb-client 10.11.5-r0 apk -mariadb-common 10.11.5-r0 apk -masterminds/html5 2.8.1 php-composer -memcached 1.6.21-r0 apk -mkfontscale 1.2.2-r3 apk -mockery/mockery 1.6.6 php-composer -monolog/monolog 2.9.1 php-composer -mtdowling/jmespath.php 2.7.0 php-composer -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk -myclabs/deep-copy 1.11.1 php-composer -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk -nesbot/carbon 2.71.0 php-composer -netcat-openbsd 1.219-r1 apk -nette/schema v1.2.5 php-composer -nette/utils v4.0.2 php-composer -nghttp2-libs 1.57.0-r0 apk -nginx 1.24.0-r7 apk -nikic/php-parser v4.17.1 php-composer -nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.4 php-composer -nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.8-r1 apk -openssl 3.1.4-r1 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r3 apk -pcre2 10.42-r1 apk -perl 5.36.2-r0 apk -perl-error 0.17029-r1 apk -perl-git 2.40.1-r0 apk -phar-io/manifest 2.0.3 php-composer -phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.4 php-composer -phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.13-r0 apk -php82-common 8.2.13-r0 apk -php82-ctype 8.2.13-r0 apk -php82-curl 8.2.13-r0 apk -php82-dom 8.2.13-r0 apk -php82-fileinfo 8.2.13-r0 apk -php82-fpm 8.2.13-r0 apk -php82-gd 8.2.13-r0 apk -php82-iconv 8.2.13-r0 apk -php82-ldap 8.2.13-r0 apk -php82-mbstring 8.2.13-r0 apk -php82-mysqlnd 8.2.13-r0 apk -php82-openssl 8.2.13-r0 apk -php82-pdo 8.2.13-r0 apk -php82-pdo_mysql 8.2.13-r0 apk -php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-memcached 3.2.0-r1 apk -php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.13-r0 apk -php82-session 8.2.13-r0 apk -php82-simplexml 8.2.13-r0 apk -php82-sockets 8.2.13-r0 apk -php82-tokenizer 8.2.13-r0 apk -php82-xml 8.2.13-r0 apk -php82-xmlwriter 8.2.13-r0 apk -php82-zip 8.2.13-r0 apk -phpmyadmin/sql-parser 5.8.2 php-composer -phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.23 php-composer -phpstan/phpstan 1.10.39 php-composer -phpunit/php-code-coverage 9.2.29 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.13 php-composer -popt 1.19-r2 apk -pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.2 php-composer -procps-ng 4.0.4-r0 apk -psr/cache 3.0.0 php-composer -psr/clock 1.0.0 php-composer -psr/container 2.0.2 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.3 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer -psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.22 php-composer -qt5-qtbase 5.15.9_git20230505-r0 apk -ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.4 php-composer -readline 8.2.1-r1 apk -robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser 8.4.0 php-composer -scanelf 1.3.7-r1 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.2 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.6 php-composer -sebastian/lines-of-code 1.0.3 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk -socialiteproviders/discord 4.2.0 php-composer -socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.4.0 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.3.0 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.7.2 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r5 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.28.0 php-composer -symfony/polyfill-intl-grapheme v1.28.0 php-composer -symfony/polyfill-intl-idn v1.28.0 php-composer -symfony/polyfill-intl-normalizer v1.28.0 php-composer -symfony/polyfill-mbstring v1.28.0 php-composer -symfony/polyfill-php72 v1.28.0 php-composer -symfony/polyfill-php80 v1.28.0 php-composer -symfony/polyfill-php81 v1.28.0 php-composer -symfony/polyfill-uuid v1.28.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.1 php-composer -tijsverkoyen/css-to-inline-styles 2.2.6 php-composer -tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk -vlucas/phpdotenv v5.5.0 php-composer -voku/portable-ascii 2.0.1 php-composer -webmozart/assert 1.11.0 php-composer -xz-libs 5.4.3-r0 apk -zlib 1.2.13-r1 apk -zstd-libs 1.5.5-r4 apk +NAME VERSION TYPE +Hidden Input 1, 0, 0, 0 dotnet +alpine-baselayout 3.4.3-r1 apk +alpine-baselayout-data 3.4.3-r1 apk +alpine-keys 2.4-r1 apk +alpine-release 3.18.5-r0 apk +aom-libs 3.6.1-r0 apk +apache2-utils 2.4.58-r0 apk +apk-tools 2.14.0-r2 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r4 apk +aws/aws-crt-php v1.2.2 php-composer +aws/aws-sdk-php 3.283.8 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer +bash 5.2.15-r5 apk +brick/math 0.11.0 php-composer +brotli-libs 1.0.9-r14 apk +busybox 1.36.1-r5 apk +busybox-binsh 1.36.1-r5 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +composer 2.6.6 binary +coreutils 9.3-r1 apk +curl 8.5.0-r0 apk +dasprid/enum 1.0.5 php-composer +dbus-libs 1.14.8-r0 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.7.1 php-composer +doctrine/deprecations 1.1.2 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.8 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.0 php-composer +dompdf/dompdf v2.0.3 php-composer +dragonmantank/cron-expression v3.3.3 php-composer +egulias/email-validator 3.2.6 php-composer +encodings 1.0.7-r1 apk +fakerphp/faker v1.23.0 php-composer +filp/whoops 2.15.3 php-composer +font-freefont 20120503-r4 apk +fontconfig 2.14.2-r3 apk +freetype 2.13.0-r5 apk +fruitcake/php-cors v1.3.0 php-composer +gdbm 1.23-r1 apk +git 2.40.1-r0 apk +git-perl 2.40.1-r0 apk +glib 2.76.4-r0 apk +graham-campbell/result-type v1.1.1 php-composer +guzzlehttp/guzzle 7.8.0 php-composer +guzzlehttp/promises 2.0.1 php-composer +guzzlehttp/psr7 2.6.1 php-composer +guzzlehttp/uri-template v1.0.2 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +icu-data-full 73.2-r2 apk +icu-libs 73.2-r2 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.1.12 php-composer +jq 1.6-r4 apk +knplabs/knp-snappy v1.4.4 php-composer +laravel/framework v9.52.16 php-composer +laravel/serializable-closure v1.3.1 php-composer +laravel/socialite v5.9.1 php-composer +laravel/tinker v2.8.2 php-composer +league/commonmark 2.4.1 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.17.0 php-composer +league/flysystem-aws-s3-v3 3.16.0 php-composer +league/flysystem-local 3.16.0 php-composer +league/html-to-markdown 5.1.1 php-composer +league/mime-type-detection 1.14.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.7.0 php-composer +libacl 2.3.1-r3 apk +libattr 2.5.1-r4 apk +libavif 0.11.1-r2 apk +libblkid 2.38.1-r8 apk +libbsd 0.11.7-r1 apk +libbz2 1.0.8-r5 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r1 apk +libcurl 8.5.0-r0 apk +libdav1d 1.2.1-r0 apk +libedit 20221030.3.1-r1 apk +libevent 2.1.12-r6 apk +libexpat 2.5.0-r1 apk +libffi 3.4.4-r2 apk +libfontenc 1.1.7-r2 apk +libgcc 12.2.1_git20220924-r10 apk +libice 1.1.1-r2 apk +libidn2 2.3.4-r1 apk +libintl 0.21.1-r7 apk +libjpeg-turbo 2.1.5.1-r3 apk +libldap 2.6.5-r0 apk +libmd 1.0.4-r2 apk +libmemcached-libs 1.1.4-r1 apk +libmount 2.38.1-r8 apk +libncursesw 6.4_p20230506-r0 apk +libpcre2-16 10.42-r1 apk +libpng 1.6.39-r3 apk +libproc2 4.0.4-r0 apk +libsasl 2.1.28-r4 apk +libseccomp 2.5.4-r2 apk +libsm 1.2.4-r1 apk +libssl3 3.1.4-r1 apk +libstdc++ 12.2.1_git20220924-r10 apk +libunistring 1.1-r1 apk +libuuid 2.38.1-r8 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r2 apk +libxcb 1.15-r1 apk +libxdmcp 1.1.4-r2 apk +libxext 1.3.5-r2 apk +libxml2 2.11.6-r0 apk +libxpm 3.5.16-r1 apk +libxt 1.3.0-r2 apk +libzip 1.9.2-r2 apk +linux-pam 1.5.2-r10 apk +logrotate 3.21.0-r1 apk +mariadb-client 10.11.5-r0 apk +mariadb-common 10.11.5-r0 apk +masterminds/html5 2.8.1 php-composer +memcached 1.6.21-r0 apk +mkfontscale 1.2.2-r3 apk +mockery/mockery 1.6.6 php-composer +monolog/monolog 2.9.1 php-composer +mtdowling/jmespath.php 2.7.0 php-composer +musl 1.2.4-r2 apk +musl-utils 1.2.4-r2 apk +myclabs/deep-copy 1.11.1 php-composer +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20230506-r0 apk +nesbot/carbon 2.71.0 php-composer +netcat-openbsd 1.219-r1 apk +nette/schema v1.2.5 php-composer +nette/utils v4.0.2 php-composer +nghttp2-libs 1.57.0-r0 apk +nginx 1.24.0-r7 apk +nikic/php-parser v4.17.1 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/larastan v2.6.4 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.8-r1 apk +openssl 3.1.4-r1 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r1 apk +perl 5.36.2-r0 apk +perl-error 0.17029-r1 apk +perl-git 2.40.1-r0 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.4 php-composer +phenx/php-svg-lib 0.5.0 php-composer +php82 8.2.13-r0 apk +php82-common 8.2.13-r0 apk +php82-ctype 8.2.13-r0 apk +php82-curl 8.2.13-r0 apk +php82-dom 8.2.13-r0 apk +php82-fileinfo 8.2.13-r0 apk +php82-fpm 8.2.13-r0 apk +php82-gd 8.2.13-r0 apk +php82-iconv 8.2.13-r0 apk +php82-ldap 8.2.13-r0 apk +php82-mbstring 8.2.13-r0 apk +php82-mysqlnd 8.2.13-r0 apk +php82-openssl 8.2.13-r0 apk +php82-pdo 8.2.13-r0 apk +php82-pdo_mysql 8.2.13-r0 apk +php82-pecl-igbinary 3.2.14-r0 apk +php82-pecl-memcached 3.2.0-r1 apk +php82-pecl-msgpack 2.2.0-r0 apk +php82-phar 8.2.13-r0 apk +php82-session 8.2.13-r0 apk +php82-simplexml 8.2.13-r0 apk +php82-sockets 8.2.13-r0 apk +php82-tokenizer 8.2.13-r0 apk +php82-xml 8.2.13-r0 apk +php82-xmlwriter 8.2.13-r0 apk +php82-zip 8.2.13-r0 apk +phpmyadmin/sql-parser 5.8.2 php-composer +phpoption/phpoption 1.9.1 php-composer +phpseclib/phpseclib 3.0.23 php-composer +phpstan/phpstan 1.10.39 php-composer +phpunit/php-code-coverage 9.2.29 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.13 php-composer +popt 1.19-r2 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.2.2 php-composer +procps-ng 4.0.4-r0 apk +psr/cache 3.0.0 php-composer +psr/clock 1.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.3 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.11.22 php-composer +qt5-qtbase 5.15.9_git20230505-r0 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.4 php-composer +readline 8.2.1-r1 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser 8.4.0 php-composer +scanelf 1.3.7-r1 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.2 php-composer +sebastian/diff 4.0.5 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.6 php-composer +sebastian/lines-of-code 1.0.3 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.13-r4 apk +skalibs 2.13.1.1-r1 apk +socialiteproviders/discord 4.2.0 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.4.0 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.3.0 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.7.2 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssddanbrown/symfony-mailer 6.0.x-dev php-composer +ssl_client 1.36.1-r5 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.28.0 php-composer +symfony/polyfill-intl-grapheme v1.28.0 php-composer +symfony/polyfill-intl-idn v1.28.0 php-composer +symfony/polyfill-intl-normalizer v1.28.0 php-composer +symfony/polyfill-mbstring v1.28.0 php-composer +symfony/polyfill-php72 v1.28.0 php-composer +symfony/polyfill-php80 v1.28.0 php-composer +symfony/polyfill-php81 v1.28.0 php-composer +symfony/polyfill-uuid v1.28.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.1 php-composer +tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +tzdata 2023c-r1 apk +utmps-libs 0.1.2.1-r1 apk +vlucas/phpdotenv v5.5.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz-libs 5.4.3-r0 apk +zlib 1.2.13-r1 apk +zstd-libs 1.5.5-r4 apk From 4f569dfdf851624cb199ad449dcff8fb5410ae19 Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Mon, 25 Dec 2023 14:16:11 -0600 Subject: [PATCH 320/452] Cleanup default site conf Signed-off-by: Eric Nemchik <eric@nemchik.com> --- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 4c988e4..f13564d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "31.10.23:", desc: "Further sanitize sed replace." } - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 3fd7d26..0644fbf 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; @@ -19,11 +19,16 @@ server { #auth_basic "Restricted"; #auth_basic_user_file /config/nginx/.htpasswd; - try_files $uri $uri/ /index.php$is_args$args; + try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args; } location ~ ^(.+\.php)(.*)$ { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + fastcgi_split_path_info ^(.+\.php)(.*)$; + if (!-f $document_root$fastcgi_script_name) { return 404; } fastcgi_pass 127.0.0.1:9000; fastcgi_index index.php; include /etc/nginx/fastcgi_params; From 72b2f7dacba71398f6197d49403c03049cac2e6f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 28 Dec 2023 18:29:25 +0000 Subject: [PATCH 321/452] Bot Updating Templated Files --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 826c1e2..3722159 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ docker run -d \ -e DB_DATABASE=bookstackapp \ -e QUEUE_CONNECTION= `#optional` \ -p 6875:80 \ - -v /path/to/data:/config \ + -v /path/to/bookstack/config:/config \ --restart unless-stopped \ lscr.io/linuxserver/bookstack:latest ``` @@ -174,7 +174,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e DB_PASS=yourdbpass` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling). | -| `-v /config` | this will store any uploaded data on the docker host | +| `-v /config` | Persistent config files | ## Environment variables from files (Docker secrets) @@ -352,6 +352,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **31.10.23:** - Further sanitize sed replace. * **07.06.23:** - Add mariadb-client for bookstack-system-cli support. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. From de6b81a9754ac8787514bcb0715537e90cc8ea2c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 28 Dec 2023 18:34:11 +0000 Subject: [PATCH 322/452] Bot Updating Package Versions --- package_versions.txt | 232 ++++++++++++++++++++++--------------------- 1 file changed, 119 insertions(+), 113 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 776152a..68a4c28 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,32 +1,36 @@ NAME VERSION TYPE Hidden Input 1, 0, 0, 0 dotnet -alpine-baselayout 3.4.3-r1 apk -alpine-baselayout-data 3.4.3-r1 apk +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk alpine-keys 2.4-r1 apk -alpine-release 3.18.5-r0 apk -aom-libs 3.6.1-r0 apk -apache2-utils 2.4.58-r0 apk -apk-tools 2.14.0-r2 apk +alpine-release 3.19.0-r0 apk +aom-libs 3.7.1-r0 apk +apache2-utils 2.4.58-r1 apk +apk-tools 2.14.0-r5 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk -argon2-libs 20190702-r4 apk +argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.2 php-composer aws/aws-sdk-php 3.283.8 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.15-r5 apk +bash 5.2.21-r0 apk brick/math 0.11.0 php-composer -brotli-libs 1.0.9-r14 apk -busybox 1.36.1-r5 apk -busybox-binsh 1.36.1-r5 apk +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +c-ares 1.22.1-r0 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk composer 2.6.6 binary -coreutils 9.3-r1 apk +coreutils 9.4-r1 apk +coreutils-env 9.4-r1 apk +coreutils-fmt 9.4-r1 apk +coreutils-sha512sum 9.4-r1 apk curl 8.5.0-r0 apk dasprid/enum 1.0.5 php-composer -dbus-libs 1.14.8-r0 apk +dbus-libs 1.14.10-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.7.1 php-composer @@ -42,24 +46,25 @@ encodings 1.0.7-r1 apk fakerphp/faker v1.23.0 php-composer filp/whoops 2.15.3 php-composer font-freefont 20120503-r4 apk -fontconfig 2.14.2-r3 apk -freetype 2.13.0-r5 apk +fontconfig 2.14.2-r4 apk +freetype 2.13.2-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk -git 2.40.1-r0 apk -git-perl 2.40.1-r0 apk -glib 2.76.4-r0 apk +git 2.43.0-r0 apk +git-perl 2.43.0-r0 apk +glib 2.78.3-r0 apk graham-campbell/result-type v1.1.1 php-composer guzzlehttp/guzzle 7.8.0 php-composer guzzlehttp/promises 2.0.1 php-composer guzzlehttp/psr7 2.6.1 php-composer guzzlehttp/uri-template v1.0.2 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 73.2-r2 apk -icu-libs 73.2-r2 apk +hiredis 1.2.0-r0 apk +icu-data-full 74.1-r0 apk +icu-libs 74.1-r0 apk intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer -jq 1.6-r4 apk +jq 1.7.1-r0 apk knplabs/knp-snappy v1.4.4 php-composer laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.1 php-composer @@ -74,116 +79,117 @@ league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.14.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r3 apk -libattr 2.5.1-r4 apk -libavif 0.11.1-r2 apk -libblkid 2.38.1-r8 apk -libbsd 0.11.7-r1 apk -libbz2 1.0.8-r5 apk +libacl 2.3.1-r4 apk +libattr 2.5.1-r5 apk +libavif 1.0.3-r0 apk +libblkid 2.39.3-r0 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r1 apk +libcrypto3 3.1.4-r2 apk libcurl 8.5.0-r0 apk -libdav1d 1.2.1-r0 apk -libedit 20221030.3.1-r1 apk -libevent 2.1.12-r6 apk -libexpat 2.5.0-r1 apk -libffi 3.4.4-r2 apk -libfontenc 1.1.7-r2 apk -libgcc 12.2.1_git20220924-r10 apk -libice 1.1.1-r2 apk -libidn2 2.3.4-r1 apk -libintl 0.21.1-r7 apk -libjpeg-turbo 2.1.5.1-r3 apk -libldap 2.6.5-r0 apk -libmd 1.0.4-r2 apk +libdav1d 1.3.0-r0 apk +libedit 20230828.3.1-r3 apk +libevent 2.1.12-r7 apk +libexpat 2.5.0-r2 apk +libffi 3.4.4-r3 apk +libfontenc 1.1.7-r4 apk +libgcc 13.2.1_git20231014-r0 apk +libice 1.1.1-r5 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libldap 2.6.6-r1 apk +libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.38.1-r8 apk -libncursesw 6.4_p20230506-r0 apk -libpcre2-16 10.42-r1 apk -libpng 1.6.39-r3 apk +libmount 2.39.3-r0 apk +libncursesw 6.4_p20231125-r0 apk +libpcre2-16 10.42-r2 apk +libpng 1.6.40-r0 apk libproc2 4.0.4-r0 apk -libsasl 2.1.28-r4 apk -libseccomp 2.5.4-r2 apk -libsm 1.2.4-r1 apk -libssl3 3.1.4-r1 apk -libstdc++ 12.2.1_git20220924-r10 apk -libunistring 1.1-r1 apk -libuuid 2.38.1-r8 apk +libsasl 2.1.28-r5 apk +libseccomp 2.5.5-r0 apk +libsharpyuv 1.3.2-r0 apk +libsm 1.2.4-r3 apk +libssl3 3.1.4-r2 apk +libstdc++ 13.2.1_git20231014-r0 apk +libunistring 1.1-r2 apk +libuuid 2.39.3-r0 apk libwebp 1.3.2-r0 apk libx11 1.8.7-r0 apk -libxau 1.0.11-r2 apk -libxcb 1.15-r1 apk -libxdmcp 1.1.4-r2 apk -libxext 1.3.5-r2 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk libxml2 2.11.6-r0 apk -libxpm 3.5.16-r1 apk -libxt 1.3.0-r2 apk -libzip 1.9.2-r2 apk -linux-pam 1.5.2-r10 apk +libxpm 3.5.17-r0 apk +libxt 1.3.0-r4 apk +libzip 1.10.1-r0 apk +linux-pam 1.5.3-r7 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.5-r0 apk -mariadb-common 10.11.5-r0 apk +mariadb-client 10.11.5-r3 apk +mariadb-common 10.11.5-r3 apk masterminds/html5 2.8.1 php-composer -memcached 1.6.21-r0 apk -mkfontscale 1.2.2-r3 apk +memcached 1.6.22-r0 apk +mkfontscale 1.2.2-r4 apk mockery/mockery 1.6.6 php-composer monolog/monolog 2.9.1 php-composer mtdowling/jmespath.php 2.7.0 php-composer -musl 1.2.4-r2 apk -musl-utils 1.2.4-r2 apk +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20230506-r0 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk nesbot/carbon 2.71.0 php-composer -netcat-openbsd 1.219-r1 apk +netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer nette/utils v4.0.2 php-composer -nghttp2-libs 1.57.0-r0 apk -nginx 1.24.0-r7 apk +nghttp2-libs 1.58.0-r0 apk +nginx 1.24.0-r14 apk nikic/php-parser v4.17.1 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/larastan v2.6.4 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.8-r1 apk -openssl 3.1.4-r1 apk +oniguruma 6.9.9-r0 apk +openssl 3.1.4-r2 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk -pcre2 10.42-r1 apk -perl 5.36.2-r0 apk -perl-error 0.17029-r1 apk -perl-git 2.40.1-r0 apk +pcre2 10.42-r2 apk +perl 5.38.2-r0 apk +perl-error 0.17029-r2 apk +perl-git 2.43.0-r0 apk phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.0 php-composer -php82 8.2.13-r0 apk -php82-common 8.2.13-r0 apk -php82-ctype 8.2.13-r0 apk -php82-curl 8.2.13-r0 apk -php82-dom 8.2.13-r0 apk -php82-fileinfo 8.2.13-r0 apk -php82-fpm 8.2.13-r0 apk -php82-gd 8.2.13-r0 apk -php82-iconv 8.2.13-r0 apk -php82-ldap 8.2.13-r0 apk -php82-mbstring 8.2.13-r0 apk -php82-mysqlnd 8.2.13-r0 apk -php82-openssl 8.2.13-r0 apk -php82-pdo 8.2.13-r0 apk -php82-pdo_mysql 8.2.13-r0 apk -php82-pecl-igbinary 3.2.14-r0 apk -php82-pecl-memcached 3.2.0-r1 apk -php82-pecl-msgpack 2.2.0-r0 apk -php82-phar 8.2.13-r0 apk -php82-session 8.2.13-r0 apk -php82-simplexml 8.2.13-r0 apk -php82-sockets 8.2.13-r0 apk -php82-tokenizer 8.2.13-r0 apk -php82-xml 8.2.13-r0 apk -php82-xmlwriter 8.2.13-r0 apk -php82-zip 8.2.13-r0 apk +php83 8.3.1-r0 apk +php83-common 8.3.1-r0 apk +php83-ctype 8.3.1-r0 apk +php83-curl 8.3.1-r0 apk +php83-dom 8.3.1-r0 apk +php83-fileinfo 8.3.1-r0 apk +php83-fpm 8.3.1-r0 apk +php83-gd 8.3.1-r0 apk +php83-iconv 8.3.1-r0 apk +php83-ldap 8.3.1-r0 apk +php83-mbstring 8.3.1-r0 apk +php83-mysqlnd 8.3.1-r0 apk +php83-openssl 8.3.1-r0 apk +php83-pdo 8.3.1-r0 apk +php83-pdo_mysql 8.3.1-r0 apk +php83-pecl-igbinary 3.2.15-r0 apk +php83-pecl-memcached 3.2.0-r0 apk +php83-pecl-msgpack 2.2.0-r1 apk +php83-phar 8.3.1-r0 apk +php83-session 8.3.1-r0 apk +php83-simplexml 8.3.1-r0 apk +php83-sockets 8.3.1-r0 apk +php83-tokenizer 8.3.1-r0 apk +php83-xml 8.3.1-r0 apk +php83-xmlwriter 8.3.1-r0 apk +php83-zip 8.3.1-r0 apk phpmyadmin/sql-parser 5.8.2 php-composer phpoption/phpoption 1.9.1 php-composer phpseclib/phpseclib 3.0.23 php-composer @@ -194,7 +200,7 @@ phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer phpunit/phpunit 9.6.13 php-composer -popt 1.19-r2 apk +popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer procps-ng 4.0.4-r0 apk @@ -208,14 +214,14 @@ psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer psy/psysh v0.11.22 php-composer -qt5-qtbase 5.15.9_git20230505-r0 apk +qt5-qtbase 5.15.10_git20230714-r1 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer ramsey/uuid 4.7.4 php-composer -readline 8.2.1-r1 apk +readline 8.2.1-r2 apk robrichards/xmlseclibs 3.1.1 php-composer sabberworm/php-css-parser 8.4.0 php-composer -scanelf 1.3.7-r1 apk +scanelf 1.3.7-r2 apk sebastian/cli-parser 1.0.1 php-composer sebastian/code-unit 1.0.8 php-composer sebastian/code-unit-reverse-lookup 2.0.3 php-composer @@ -232,8 +238,8 @@ sebastian/recursion-context 4.0.5 php-composer sebastian/resource-operations 3.0.3 php-composer sebastian/type 3.2.1 php-composer sebastian/version 3.0.2 php-composer -shadow 4.13-r4 apk -skalibs 2.13.1.1-r1 apk +shadow 4.14.2-r0 apk +skalibs 2.14.0.1-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.4.0 php-composer @@ -244,7 +250,7 @@ squizlabs/php_codesniffer 3.7.2 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r5 apk +ssl_client 1.36.1-r15 apk symfony/console v6.0.19 php-composer symfony/css-selector v6.0.19 php-composer symfony/deprecation-contracts v3.0.2 php-composer @@ -276,10 +282,10 @@ symfony/var-dumper v6.0.19 php-composer theseer/tokenizer 1.2.1 php-composer tijsverkoyen/css-to-inline-styles 2.2.6 php-composer tzdata 2023c-r1 apk -utmps-libs 0.1.2.1-r1 apk +utmps-libs 0.1.2.2-r0 apk vlucas/phpdotenv v5.5.0 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer -xz-libs 5.4.3-r0 apk -zlib 1.2.13-r1 apk -zstd-libs 1.5.5-r4 apk +xz-libs 5.4.5-r0 apk +zlib 1.3-r2 apk +zstd-libs 1.5.5-r8 apk From cc18bc0f84ef1d20fb61a5e8716400cc63329209 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 29 Dec 2023 12:48:05 +0000 Subject: [PATCH 323/452] Bot Updating Package Versions --- package_versions.txt | 71 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 68a4c28..cf7cee6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ apk-tools 2.14.0-r5 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk -aws/aws-crt-php v1.2.2 php-composer -aws/aws-sdk-php 3.283.8 php-composer +aws/aws-crt-php v1.2.4 php-composer +aws/aws-sdk-php 3.294.5 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -23,6 +23,7 @@ busybox-binsh 1.36.1-r15 apk c-ares 1.22.1-r0 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk +carbonphp/carbon-doctrine-types 2.1.0 php-composer composer 2.6.6 binary coreutils 9.4-r1 apk coreutils-env 9.4-r1 apk @@ -33,18 +34,18 @@ dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.7.1 php-composer +doctrine/dbal 3.7.2 php-composer doctrine/deprecations 1.1.2 php-composer doctrine/event-manager 1.2.0 php-composer doctrine/inflector 2.0.8 php-composer doctrine/instantiator 1.5.0 php-composer doctrine/lexer 2.1.0 php-composer -dompdf/dompdf v2.0.3 php-composer +dompdf/dompdf v2.0.4 php-composer dragonmantank/cron-expression v3.3.3 php-composer egulias/email-validator 3.2.6 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.0 php-composer -filp/whoops 2.15.3 php-composer +filp/whoops 2.15.4 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk @@ -53,11 +54,11 @@ gdbm 1.23-r1 apk git 2.43.0-r0 apk git-perl 2.43.0-r0 apk glib 2.78.3-r0 apk -graham-campbell/result-type v1.1.1 php-composer -guzzlehttp/guzzle 7.8.0 php-composer -guzzlehttp/promises 2.0.1 php-composer -guzzlehttp/psr7 2.6.1 php-composer -guzzlehttp/uri-template v1.0.2 php-composer +graham-campbell/result-type v1.1.2 php-composer +guzzlehttp/guzzle 7.8.1 php-composer +guzzlehttp/promises 2.0.2 php-composer +guzzlehttp/psr7 2.6.2 php-composer +guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer hiredis 1.2.0-r0 apk icu-data-full 74.1-r0 apk @@ -66,15 +67,16 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.4.4 php-composer +larastan/larastan v2.7.0 php-composer laravel/framework v9.52.16 php-composer -laravel/serializable-closure v1.3.1 php-composer -laravel/socialite v5.9.1 php-composer +laravel/serializable-closure v1.3.3 php-composer +laravel/socialite v5.11.0 php-composer laravel/tinker v2.8.2 php-composer league/commonmark 2.4.1 php-composer league/config v1.2.0 php-composer -league/flysystem 3.17.0 php-composer -league/flysystem-aws-s3-v3 3.16.0 php-composer -league/flysystem-local 3.16.0 php-composer +league/flysystem 3.23.0 php-composer +league/flysystem-aws-s3-v3 3.22.0 php-composer +league/flysystem-local 3.23.0 php-composer league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.14.0 php-composer league/oauth1-client v1.10.1 php-composer @@ -132,23 +134,22 @@ mariadb-common 10.11.5-r3 apk masterminds/html5 2.8.1 php-composer memcached 1.6.22-r0 apk mkfontscale 1.2.2-r4 apk -mockery/mockery 1.6.6 php-composer -monolog/monolog 2.9.1 php-composer +mockery/mockery 1.6.7 php-composer +monolog/monolog 2.9.2 php-composer mtdowling/jmespath.php 2.7.0 php-composer musl 1.2.4_git20230717-r4 apk musl-utils 1.2.4_git20230717-r4 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20231125-r0 apk -nesbot/carbon 2.71.0 php-composer +nesbot/carbon 2.72.1 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer -nette/utils v4.0.2 php-composer +nette/utils v4.0.3 php-composer nghttp2-libs 1.58.0-r0 apk nginx 1.24.0-r14 apk -nikic/php-parser v4.17.1 php-composer +nikic/php-parser v4.18.0 php-composer nunomaduro/collision v6.4.0 php-composer -nunomaduro/larastan v2.6.4 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk @@ -163,7 +164,7 @@ perl-git 2.43.0-r0 apk phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer -phenx/php-svg-lib 0.5.0 php-composer +phenx/php-svg-lib 0.5.1 php-composer php83 8.3.1-r0 apk php83-common 8.3.1-r0 apk php83-ctype 8.3.1-r0 apk @@ -191,15 +192,15 @@ php83-xml 8.3.1-r0 apk php83-xmlwriter 8.3.1-r0 apk php83-zip 8.3.1-r0 apk phpmyadmin/sql-parser 5.8.2 php-composer -phpoption/phpoption 1.9.1 php-composer -phpseclib/phpseclib 3.0.23 php-composer -phpstan/phpstan 1.10.39 php-composer -phpunit/php-code-coverage 9.2.29 php-composer +phpoption/phpoption 1.9.2 php-composer +phpseclib/phpseclib 3.0.34 php-composer +phpstan/phpstan 1.10.50 php-composer +phpunit/php-code-coverage 9.2.30 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.13 php-composer +phpunit/phpunit 9.6.15 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -217,7 +218,7 @@ psy/psysh v0.11.22 php-composer qt5-qtbase 5.15.10_git20230714-r1 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.4 php-composer +ramsey/uuid 4.7.5 php-composer readline 8.2.1-r2 apk robrichards/xmlseclibs 3.1.1 php-composer sabberworm/php-css-parser 8.4.0 php-composer @@ -226,12 +227,12 @@ sebastian/cli-parser 1.0.1 php-composer sebastian/code-unit 1.0.8 php-composer sebastian/code-unit-reverse-lookup 2.0.3 php-composer sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.2 php-composer +sebastian/complexity 2.0.3 php-composer sebastian/diff 4.0.5 php-composer sebastian/environment 5.1.5 php-composer sebastian/exporter 4.0.5 php-composer sebastian/global-state 5.0.6 php-composer -sebastian/lines-of-code 1.0.3 php-composer +sebastian/lines-of-code 1.0.4 php-composer sebastian/object-enumerator 4.0.4 php-composer sebastian/object-reflector 2.0.4 php-composer sebastian/recursion-context 4.0.5 php-composer @@ -244,9 +245,9 @@ socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.4.0 php-composer socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.3.0 php-composer +socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.7.2 php-composer +squizlabs/php_codesniffer 3.8.0 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer @@ -279,11 +280,11 @@ symfony/translation v6.0.19 php-composer symfony/translation-contracts v3.0.2 php-composer symfony/uid v6.0.19 php-composer symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.1 php-composer -tijsverkoyen/css-to-inline-styles 2.2.6 php-composer +theseer/tokenizer 1.2.2 php-composer +tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2023c-r1 apk utmps-libs 0.1.2.2-r0 apk -vlucas/phpdotenv v5.5.0 php-composer +vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer xz-libs 5.4.5-r0 apk From e1e6dd2a300f9a545f711bcae8963dfe8f896b99 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 Jan 2024 18:22:31 +0000 Subject: [PATCH 324/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cf7cee6..07e30fa 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -215,7 +215,7 @@ psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer psy/psysh v0.11.22 php-composer -qt5-qtbase 5.15.10_git20230714-r1 apk +qt5-qtbase 5.15.10_git20230714-r2 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer ramsey/uuid 4.7.5 php-composer @@ -282,7 +282,7 @@ symfony/uid v6.0.19 php-composer symfony/var-dumper v6.0.19 php-composer theseer/tokenizer 1.2.2 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2023c-r1 apk +tzdata 2023d-r0 apk utmps-libs 0.1.2.2-r0 apk vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer From 755270f4752fd44c2aa110a440e927caab09c1fe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jan 2024 18:21:12 +0000 Subject: [PATCH 325/452] Bot Updating Templated Files --- Jenkinsfile | 287 +++++++++++++++++++++++++++------------------------- 1 file changed, 148 insertions(+), 139 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e94cba4..609dd7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') + DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') EXT_GIT_BRANCH = 'master' EXT_USER = 'bookstackapp' EXT_REPO = 'bookstack' @@ -61,11 +62,16 @@ pipeline { env.COMMIT_SHA = sh( script: '''git rev-parse HEAD''', returnStdout: true).trim() + env.GH_DEFAULT_BRANCH = sh( + script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''', + returnStdout: true).trim() env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/workflows/package_trigger.yml' } + sh '''#! /bin/bash + echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ env.LS_RELEASE_NUMBER = sh( script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', @@ -130,7 +136,7 @@ pipeline { steps{ script{ env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''', + script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''', returnStdout: true).trim() def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ @@ -148,7 +154,7 @@ pipeline { } if (env.SEMVER != null) { - if (BRANCH_NAME != "master" && BRANCH_NAME != "main") { + if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") { env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" } println("SEMVER: ${env.SEMVER}") @@ -266,115 +272,150 @@ pipeline { } } steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." - fi - # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', + usernameVariable: 'DOCKERUSER', + passwordVariable: 'DOCKERPASS' + ] + ]) { + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." fi - done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" + fi done - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" + done + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore + fi + git add readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - fi - if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + fi + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" + else + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" + fi + DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' + echo "Not the default Github branch. Skipping readme sync to Docker Hub." fi - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() + } } } } @@ -568,7 +609,8 @@ pipeline { wait git add package_versions.txt git commit -m 'Bot Updating Package Versions' - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -864,39 +906,6 @@ EOF ) ''' } } - // Use helper container to sync the current README on master to the dockerhub endpoint - stage('Sync-README') { - when { - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - docker pull ghcr.io/linuxserver/readme-sync - docker run --rm=true \ - -e DOCKERHUB_USERNAME=$DOCKERUSER \ - -e DOCKERHUB_PASSWORD=$DOCKERPASS \ - -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \ - -e DOCKER_REPOSITORY=${IMAGE} \ - -e GIT_BRANCH=master \ - -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \ - ghcr.io/linuxserver/readme-sync bash -c 'node sync' - rm -Rf ${TEMPDIR} ''' - } - } - } // If this is a Pull request send the CI link as a comment on it stage('Pull Request Comment') { when { From c86c8298a6f802014f36a042f759edb78e606f41 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jan 2024 18:22:59 +0000 Subject: [PATCH 326/452] Bot Updating Templated Files --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 3722159..a043ae5 100644 --- a/README.md +++ b/README.md @@ -245,7 +245,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to ## Updating Info -Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. +Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image. Below are the instructions for updating containers: @@ -310,21 +310,6 @@ Below are the instructions for updating containers: docker image prune ``` -### Via Watchtower auto-updater (only use if you don't remember the original parameters) - -* Pull the latest image at its tag and replace it with the same env variables in one run: - - ```bash - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ - --run-once bookstack - ``` - -* You can also remove the old dangling images: `docker image prune` - -**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose). - ### Image Update Notifications - Diun (Docker Image Update Notifier) **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. From 9f99c7fef9e7e796506bca8cb9871786f43303c3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Jan 2024 18:26:43 +0000 Subject: [PATCH 327/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 07e30fa..1a7f2a2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -88,7 +88,7 @@ libblkid 2.39.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r2 apk +libcrypto3 3.1.4-r3 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libedit 20230828.3.1-r3 apk @@ -113,7 +113,7 @@ libsasl 2.1.28-r5 apk libseccomp 2.5.5-r0 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r2 apk +libssl3 3.1.4-r3 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -153,7 +153,7 @@ nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r2 apk +openssl 3.1.4-r3 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk From 8386f7a90bebf9783057631d2dade4c9e0fcf448 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Jan 2024 18:23:20 +0000 Subject: [PATCH 328/452] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1a7f2a2..0fac1c3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,7 +20,7 @@ brick/math 0.11.0 php-composer brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk -c-ares 1.22.1-r0 apk +c-ares 1.24.0-r0 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer @@ -88,7 +88,7 @@ libblkid 2.39.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r3 apk +libcrypto3 3.1.4-r4 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libedit 20230828.3.1-r3 apk @@ -113,7 +113,7 @@ libsasl 2.1.28-r5 apk libseccomp 2.5.5-r0 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r3 apk +libssl3 3.1.4-r4 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -153,7 +153,7 @@ nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r3 apk +openssl 3.1.4-r4 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -165,32 +165,32 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.4 php-composer phenx/php-svg-lib 0.5.1 php-composer -php83 8.3.1-r0 apk -php83-common 8.3.1-r0 apk -php83-ctype 8.3.1-r0 apk -php83-curl 8.3.1-r0 apk -php83-dom 8.3.1-r0 apk -php83-fileinfo 8.3.1-r0 apk -php83-fpm 8.3.1-r0 apk -php83-gd 8.3.1-r0 apk -php83-iconv 8.3.1-r0 apk -php83-ldap 8.3.1-r0 apk -php83-mbstring 8.3.1-r0 apk -php83-mysqlnd 8.3.1-r0 apk -php83-openssl 8.3.1-r0 apk -php83-pdo 8.3.1-r0 apk -php83-pdo_mysql 8.3.1-r0 apk +php83 8.3.2-r0 apk +php83-common 8.3.2-r0 apk +php83-ctype 8.3.2-r0 apk +php83-curl 8.3.2-r0 apk +php83-dom 8.3.2-r0 apk +php83-fileinfo 8.3.2-r0 apk +php83-fpm 8.3.2-r0 apk +php83-gd 8.3.2-r0 apk +php83-iconv 8.3.2-r0 apk +php83-ldap 8.3.2-r0 apk +php83-mbstring 8.3.2-r0 apk +php83-mysqlnd 8.3.2-r0 apk +php83-openssl 8.3.2-r0 apk +php83-pdo 8.3.2-r0 apk +php83-pdo_mysql 8.3.2-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.1-r0 apk -php83-session 8.3.1-r0 apk -php83-simplexml 8.3.1-r0 apk -php83-sockets 8.3.1-r0 apk -php83-tokenizer 8.3.1-r0 apk -php83-xml 8.3.1-r0 apk -php83-xmlwriter 8.3.1-r0 apk -php83-zip 8.3.1-r0 apk +php83-phar 8.3.2-r0 apk +php83-session 8.3.2-r0 apk +php83-simplexml 8.3.2-r0 apk +php83-sockets 8.3.2-r0 apk +php83-tokenizer 8.3.2-r0 apk +php83-xml 8.3.2-r0 apk +php83-xmlwriter 8.3.2-r0 apk +php83-zip 8.3.2-r0 apk phpmyadmin/sql-parser 5.8.2 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.34 php-composer From a2089be82ded34dbb9ee5496fe8bc7ffa65b2f82 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 24 Jan 2024 11:30:55 +0000 Subject: [PATCH 329/452] Bot Updating Package Versions --- package_versions.txt | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0fac1c3..ebd37d7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.4 php-composer -aws/aws-sdk-php 3.294.5 php-composer +aws/aws-sdk-php 3.296.8 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -34,17 +34,17 @@ dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.7.2 php-composer +doctrine/dbal 3.7.3 php-composer doctrine/deprecations 1.1.2 php-composer doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.8 php-composer +doctrine/inflector 2.0.9 php-composer doctrine/instantiator 1.5.0 php-composer doctrine/lexer 2.1.0 php-composer dompdf/dompdf v2.0.4 php-composer dragonmantank/cron-expression v3.3.3 php-composer egulias/email-validator 3.2.6 php-composer encodings 1.0.7-r1 apk -fakerphp/faker v1.23.0 php-composer +fakerphp/faker v1.23.1 php-composer filp/whoops 2.15.4 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r4 apk @@ -53,7 +53,7 @@ fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk git 2.43.0-r0 apk git-perl 2.43.0-r0 apk -glib 2.78.3-r0 apk +glib 2.78.4-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer guzzlehttp/promises 2.0.2 php-composer @@ -67,11 +67,11 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.1.12 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.4.4 php-composer -larastan/larastan v2.7.0 php-composer +larastan/larastan v2.8.1 php-composer laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.3 php-composer laravel/socialite v5.11.0 php-composer -laravel/tinker v2.8.2 php-composer +laravel/tinker v2.9.0 php-composer league/commonmark 2.4.1 php-composer league/config v1.2.0 php-composer league/flysystem 3.23.0 php-composer @@ -142,13 +142,13 @@ musl-utils 1.2.4_git20230717-r4 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20231125-r0 apk -nesbot/carbon 2.72.1 php-composer +nesbot/carbon 2.72.2 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer -nette/utils v4.0.3 php-composer +nette/utils v4.0.4 php-composer nghttp2-libs 1.58.0-r0 apk nginx 1.24.0-r14 apk -nikic/php-parser v4.18.0 php-composer +nikic/php-parser v5.0.0 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer @@ -163,7 +163,7 @@ perl-error 0.17029-r2 apk perl-git 2.43.0-r0 apk phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.4 php-composer +phenx/php-font-lib 0.5.5 php-composer phenx/php-svg-lib 0.5.1 php-composer php83 8.3.2-r0 apk php83-common 8.3.2-r0 apk @@ -191,16 +191,16 @@ php83-tokenizer 8.3.2-r0 apk php83-xml 8.3.2-r0 apk php83-xmlwriter 8.3.2-r0 apk php83-zip 8.3.2-r0 apk -phpmyadmin/sql-parser 5.8.2 php-composer +phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.34 php-composer -phpstan/phpstan 1.10.50 php-composer +phpseclib/phpseclib 3.0.35 php-composer +phpstan/phpstan 1.10.56 php-composer phpunit/php-code-coverage 9.2.30 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.15 php-composer +phpunit/phpunit 9.6.16 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -214,7 +214,7 @@ psr/http-factory 1.0.2 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.11.22 php-composer +psy/psysh v0.12.0 php-composer qt5-qtbase 5.15.10_git20230714-r2 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.3.0 php-composer @@ -247,7 +247,7 @@ socialiteproviders/manager v4.4.0 php-composer socialiteproviders/microsoft-azure 5.1.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.8.0 php-composer +squizlabs/php_codesniffer 3.8.1 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer From 6a1308143bd6c9ea927203e4c0f3622c151e36a1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 25 Jan 2024 18:50:49 +0000 Subject: [PATCH 330/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a043ae5..acbcd31 100644 --- a/README.md +++ b/README.md @@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **31.10.23:** - Further sanitize sed replace. * **07.06.23:** - Add mariadb-client for bookstack-system-cli support. From dc638a54d8c4bfc3c215eb4078c8ad8637891846 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Jan 2024 18:21:02 +0000 Subject: [PATCH 331/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ebd37d7..753dc32 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -129,8 +129,8 @@ libxt 1.3.0-r4 apk libzip 1.10.1-r0 apk linux-pam 1.5.3-r7 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.5-r3 apk -mariadb-common 10.11.5-r3 apk +mariadb-client 10.11.6-r0 apk +mariadb-common 10.11.6-r0 apk masterminds/html5 2.8.1 php-composer memcached 1.6.22-r0 apk mkfontscale 1.2.2-r4 apk From a22f015cebc38b4fffc9c1bb9823f9364fd14a48 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Feb 2024 18:22:46 +0000 Subject: [PATCH 332/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 753dc32..20e43d7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Hidden Input 1, 0, 0, 0 dotnet alpine-baselayout 3.4.3-r2 apk alpine-baselayout-data 3.4.3-r2 apk alpine-keys 2.4-r1 apk -alpine-release 3.19.0-r0 apk +alpine-release 3.19.1-r0 apk aom-libs 3.7.1-r0 apk apache2-utils 2.4.58-r1 apk apk-tools 2.14.0-r5 apk @@ -20,15 +20,15 @@ brick/math 0.11.0 php-composer brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r0 apk +c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer composer 2.6.6 binary -coreutils 9.4-r1 apk -coreutils-env 9.4-r1 apk -coreutils-fmt 9.4-r1 apk -coreutils-sha512sum 9.4-r1 apk +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk curl 8.5.0-r0 apk dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r0 apk @@ -88,7 +88,7 @@ libblkid 2.39.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r4 apk +libcrypto3 3.1.4-r5 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libedit 20230828.3.1-r3 apk @@ -113,7 +113,7 @@ libsasl 2.1.28-r5 apk libseccomp 2.5.5-r0 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r4 apk +libssl3 3.1.4-r5 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -147,13 +147,13 @@ netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.58.0-r0 apk -nginx 1.24.0-r14 apk +nginx 1.24.0-r15 apk nikic/php-parser v5.0.0 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r4 apk +openssl 3.1.4-r5 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -288,5 +288,5 @@ vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer xz-libs 5.4.5-r0 apk -zlib 1.3-r2 apk +zlib 1.3.1-r0 apk zstd-libs 1.5.5-r8 apk From ffd2adc9dddb4a4319273e39e4a0a0cf577fadc7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Feb 2024 18:20:17 +0000 Subject: [PATCH 333/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 20e43d7..2b5b54b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.6.6 binary +composer 2.7.0 binary coreutils 9.4-r2 apk coreutils-env 9.4-r2 apk coreutils-fmt 9.4-r2 apk @@ -282,7 +282,7 @@ symfony/uid v6.0.19 php-composer symfony/var-dumper v6.0.19 php-composer theseer/tokenizer 1.2.2 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2023d-r0 apk +tzdata 2024a-r0 apk utmps-libs 0.1.2.2-r0 apk vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer From 15127d9e4c7ba1c232a4eadb2695fee18cd4435c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Feb 2024 18:24:23 +0000 Subject: [PATCH 334/452] Bot Updating Package Versions --- package_versions.txt | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2b5b54b..ed4de7b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.7.0 binary +composer 2.7.1 binary coreutils 9.4-r2 apk coreutils-env 9.4-r2 apk coreutils-fmt 9.4-r2 apk @@ -93,7 +93,7 @@ libcurl 8.5.0-r0 apk libdav1d 1.3.0-r0 apk libedit 20230828.3.1-r3 apk libevent 2.1.12-r7 apk -libexpat 2.5.0-r2 apk +libexpat 2.6.0-r0 apk libffi 3.4.4-r3 apk libfontenc 1.1.7-r4 apk libgcc 13.2.1_git20231014-r0 apk @@ -123,7 +123,7 @@ libxau 1.0.11-r3 apk libxcb 1.16-r0 apk libxdmcp 1.1.4-r3 apk libxext 1.3.5-r3 apk -libxml2 2.11.6-r0 apk +libxml2 2.11.7-r0 apk libxpm 3.5.17-r0 apk libxt 1.3.0-r4 apk libzip 1.10.1-r0 apk @@ -165,32 +165,32 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.5 php-composer phenx/php-svg-lib 0.5.1 php-composer -php83 8.3.2-r0 apk -php83-common 8.3.2-r0 apk -php83-ctype 8.3.2-r0 apk -php83-curl 8.3.2-r0 apk -php83-dom 8.3.2-r0 apk -php83-fileinfo 8.3.2-r0 apk -php83-fpm 8.3.2-r0 apk -php83-gd 8.3.2-r0 apk -php83-iconv 8.3.2-r0 apk -php83-ldap 8.3.2-r0 apk -php83-mbstring 8.3.2-r0 apk -php83-mysqlnd 8.3.2-r0 apk -php83-openssl 8.3.2-r0 apk -php83-pdo 8.3.2-r0 apk -php83-pdo_mysql 8.3.2-r0 apk +php83 8.3.3-r0 apk +php83-common 8.3.3-r0 apk +php83-ctype 8.3.3-r0 apk +php83-curl 8.3.3-r0 apk +php83-dom 8.3.3-r0 apk +php83-fileinfo 8.3.3-r0 apk +php83-fpm 8.3.3-r0 apk +php83-gd 8.3.3-r0 apk +php83-iconv 8.3.3-r0 apk +php83-ldap 8.3.3-r0 apk +php83-mbstring 8.3.3-r0 apk +php83-mysqlnd 8.3.3-r0 apk +php83-openssl 8.3.3-r0 apk +php83-pdo 8.3.3-r0 apk +php83-pdo_mysql 8.3.3-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.2-r0 apk -php83-session 8.3.2-r0 apk -php83-simplexml 8.3.2-r0 apk -php83-sockets 8.3.2-r0 apk -php83-tokenizer 8.3.2-r0 apk -php83-xml 8.3.2-r0 apk -php83-xmlwriter 8.3.2-r0 apk -php83-zip 8.3.2-r0 apk +php83-phar 8.3.3-r0 apk +php83-session 8.3.3-r0 apk +php83-simplexml 8.3.3-r0 apk +php83-sockets 8.3.3-r0 apk +php83-tokenizer 8.3.3-r0 apk +php83-xml 8.3.3-r0 apk +php83-xmlwriter 8.3.3-r0 apk +php83-zip 8.3.3-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.35 php-composer From 4d41ca9239e094122c033f2f0e054759e1d7b60c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Feb 2024 12:43:20 +0000 Subject: [PATCH 335/452] Bot Updating Templated Files --- Jenkinsfile | 297 +++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 154 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 609dd7a..87b8ed2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,9 +255,11 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ - apk add --no-cache py3-pip && \ - pip install s3cmd && \ + ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache python3 && \ + python3 -m venv /lsiopy && \ + pip install --no-cache-dir -U pip && \ + pip install --no-cache-dir s3cmd && \ s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } @@ -272,150 +274,149 @@ pipeline { } } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ] - ]) { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." + sh '''#! /bin/bash + set -e + TEMPDIR=$(mktemp -d) + docker pull ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest + # Stage 1 - Jenkinsfile update + if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ + git add Jenkinsfile + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating Jenkinsfile" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "Jenkinsfile is up to date." + fi + # Stage 2 - Delete old templates + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + for i in ${OLD_TEMPLATES}; do + if [[ -f "${i}" ]]; then + TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" fi - # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi + done + if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + for i in ${TEMPLATES_TO_DELETE}; do + git rm "${i}" done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - # Stage 3 - Update templates - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Deleting old and deprecated templates" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "No templates to delete" + fi + # Stage 3 - Update templates + CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + cd ${TEMPDIR}/docker-${CONTAINER_NAME} + NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) + if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f master - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore - fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - fi - mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ - cd ${TEMPDIR}/docs/docker-documentation - GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - git add docs/images/docker-${CONTAINER_NAME}.md - git commit -m 'Bot Updating Documentation' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} - fi - mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates - if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml - elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then - sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : + cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : + cd ${TEMPDIR}/repo/${LS_REPO}/ + if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then + echo ".jenkins-external" >> .gitignore + git add .gitignore fi - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then - cd ${TEMPDIR}/unraid/templates/ - GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add unraid/${CONTAINER_NAME}.xml - git commit -m 'Bot Updating Unraid Template' - fi - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} + git add readme-vars.yml ${TEMPLATED_FILES} + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + fi + mkdir -p ${TEMPDIR}/docs + git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ + cd ${TEMPDIR}/docs/docker-documentation + GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + git add docs/images/docker-${CONTAINER_NAME}.md + git commit -m 'Bot Updating Documentation' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml + fi + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + cd ${TEMPDIR}/unraid/templates/ + GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' fi - # Stage 4 - Sync Readme to Docker Hub - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then - echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" - else - echo "Syncing readme to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" - fi - DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') - curl -s \ - -H "Authorization: JWT ${DH_TOKEN}" \ - -H "Content-Type: application/json" \ - -X PATCH \ - -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ - https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \ + (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \ + sleep $((RANDOM % MAXWAIT)) && \ + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + fi + # Stage 4 - Sync Readme to Docker Hub + if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else - echo "Not the default Github branch. Skipping readme sync to Docker Hub." + echo "Syncing readme to Docker Hub" + DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X PATCH \ + -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ + https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : + else + echo "Not the default Github branch. Skipping readme sync to Docker Hub." + fi + rm -Rf ${TEMPDIR}''' + script{ + env.FILES_UPDATED = sh( + script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', + returnStdout: true).trim() } } } @@ -713,12 +714,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -729,7 +724,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin @@ -760,12 +755,6 @@ pipeline { } steps { withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207', - usernameVariable: 'DOCKERUSER', - passwordVariable: 'DOCKERPASS' - ], [ $class: 'UsernamePasswordMultiBinding', credentialsId: 'Quay.io-Robot', @@ -776,7 +765,7 @@ pipeline { retry(5) { sh '''#! /bin/bash set -e - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin From 580623db9dea61d5aaee0543d2b454b1984de19a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Feb 2024 12:45:04 +0000 Subject: [PATCH 336/452] Bot Updating Templated Files --- .github/ISSUE_TEMPLATE/issue.bug.yml | 4 ++-- .github/workflows/external_trigger.yml | 2 +- .github/workflows/external_trigger_scheduler.yml | 2 +- .github/workflows/package_trigger.yml | 2 +- .github/workflows/package_trigger_scheduler.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index ce3d19a..f158635 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -67,10 +67,10 @@ body: - type: textarea attributes: description: | - Provide a full docker log, output of "docker logs linuxserver.io" + Provide a full docker log, output of "docker logs bookstack" label: Container logs placeholder: | - Output of `docker logs linuxserver.io` + Output of `docker logs bookstack` render: bash validations: required: true diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3505080..9d0dce6 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,7 +7,7 @@ jobs: external-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: External Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 22ecbec..cd920fe 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: external-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index d9bee33..28ed4ed 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -7,7 +7,7 @@ jobs: package-trigger-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 - name: Package Trigger if: github.ref == 'refs/heads/master' diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 26f3bdc..cb6b917 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -9,7 +9,7 @@ jobs: package-trigger-scheduler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4.1.1 with: fetch-depth: '0' From 63d71fde377f433d2e29eb2940d6d266bc185cd0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Feb 2024 12:48:11 +0000 Subject: [PATCH 337/452] Bot Updating Package Versions --- package_versions.txt | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ed4de7b..fc98464 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.4 php-composer -aws/aws-sdk-php 3.296.8 php-composer +aws/aws-sdk-php 3.300.4 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -34,12 +34,12 @@ dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.7.3 php-composer -doctrine/deprecations 1.1.2 php-composer +doctrine/dbal 3.8.2 php-composer +doctrine/deprecations 1.1.3 php-composer doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.9 php-composer +doctrine/inflector 2.0.10 php-composer doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.0 php-composer +doctrine/lexer 2.1.1 php-composer dompdf/dompdf v2.0.4 php-composer dragonmantank/cron-expression v3.3.3 php-composer egulias/email-validator 3.2.6 php-composer @@ -64,21 +64,21 @@ hiredis 1.2.0-r0 apk icu-data-full 74.1-r0 apk icu-libs 74.1-r0 apk intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.1.12 php-composer +itsgoingd/clockwork v5.2.0 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.4.4 php-composer -larastan/larastan v2.8.1 php-composer +larastan/larastan v2.9.0 php-composer laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.3 php-composer -laravel/socialite v5.11.0 php-composer +laravel/socialite v5.12.1 php-composer laravel/tinker v2.9.0 php-composer -league/commonmark 2.4.1 php-composer +league/commonmark 2.4.2 php-composer league/config v1.2.0 php-composer -league/flysystem 3.23.0 php-composer -league/flysystem-aws-s3-v3 3.22.0 php-composer -league/flysystem-local 3.23.0 php-composer +league/flysystem 3.24.0 php-composer +league/flysystem-aws-s3-v3 3.24.0 php-composer +league/flysystem-local 3.23.1 php-composer league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.14.0 php-composer +league/mime-type-detection 1.15.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer libacl 2.3.1-r4 apk @@ -142,13 +142,13 @@ musl-utils 1.2.4_git20230717-r4 apk myclabs/deep-copy 1.11.1 php-composer nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20231125-r0 apk -nesbot/carbon 2.72.2 php-composer +nesbot/carbon 2.72.3 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.58.0-r0 apk nginx 1.24.0-r15 apk -nikic/php-parser v5.0.0 php-composer +nikic/php-parser v5.0.1 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer @@ -163,8 +163,8 @@ perl-error 0.17029-r2 apk perl-git 2.43.0-r0 apk phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.5 php-composer -phenx/php-svg-lib 0.5.1 php-composer +phenx/php-font-lib 0.5.6 php-composer +phenx/php-svg-lib 0.5.2 php-composer php83 8.3.3-r0 apk php83-common 8.3.3-r0 apk php83-ctype 8.3.3-r0 apk @@ -193,14 +193,14 @@ php83-xmlwriter 8.3.3-r0 apk php83-zip 8.3.3-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.35 php-composer -phpstan/phpstan 1.10.56 php-composer +phpseclib/phpseclib 3.0.36 php-composer +phpstan/phpstan 1.10.59 php-composer phpunit/php-code-coverage 9.2.30 php-composer phpunit/php-file-iterator 3.0.6 php-composer phpunit/php-invoker 3.1.1 php-composer phpunit/php-text-template 2.0.4 php-composer phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.16 php-composer +phpunit/phpunit 9.6.17 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -221,7 +221,7 @@ ramsey/collection 1.3.0 php-composer ramsey/uuid 4.7.5 php-composer readline 8.2.1-r2 apk robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser 8.4.0 php-composer +sabberworm/php-css-parser v8.5.1 php-composer scanelf 1.3.7-r2 apk sebastian/cli-parser 1.0.1 php-composer sebastian/code-unit 1.0.8 php-composer @@ -243,11 +243,11 @@ shadow 4.14.2-r0 apk skalibs 2.14.0.1-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.4.0 php-composer +socialiteproviders/manager v4.5.1 php-composer socialiteproviders/microsoft-azure 5.1.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.8.1 php-composer +squizlabs/php_codesniffer 3.9.0 php-composer ssddanbrown/asserthtml v2.0.0 php-composer ssddanbrown/htmldiff v1.0.2 php-composer ssddanbrown/symfony-mailer 6.0.x-dev php-composer @@ -263,15 +263,15 @@ symfony/finder v6.0.19 php-composer symfony/http-foundation v6.0.20 php-composer symfony/http-kernel v6.0.20 php-composer symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.28.0 php-composer -symfony/polyfill-intl-grapheme v1.28.0 php-composer -symfony/polyfill-intl-idn v1.28.0 php-composer -symfony/polyfill-intl-normalizer v1.28.0 php-composer -symfony/polyfill-mbstring v1.28.0 php-composer -symfony/polyfill-php72 v1.28.0 php-composer -symfony/polyfill-php80 v1.28.0 php-composer -symfony/polyfill-php81 v1.28.0 php-composer -symfony/polyfill-uuid v1.28.0 php-composer +symfony/polyfill-ctype v1.29.0 php-composer +symfony/polyfill-intl-grapheme v1.29.0 php-composer +symfony/polyfill-intl-idn v1.29.0 php-composer +symfony/polyfill-intl-normalizer v1.29.0 php-composer +symfony/polyfill-mbstring v1.29.0 php-composer +symfony/polyfill-php72 v1.29.0 php-composer +symfony/polyfill-php80 v1.29.0 php-composer +symfony/polyfill-php81 v1.29.0 php-composer +symfony/polyfill-uuid v1.29.0 php-composer symfony/process v6.0.19 php-composer symfony/routing v6.0.19 php-composer symfony/service-contracts v3.0.2 php-composer From 4e1861dc9517dfe22d959825916178a359797853 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 28 Feb 2024 14:31:22 +0000 Subject: [PATCH 338/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fc98464..af2f74a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.4 php-composer -aws/aws-sdk-php 3.300.4 php-composer +aws/aws-sdk-php 3.300.6 php-composer bacon/bacon-qr-code 2.0.8 php-composer barryvdh/laravel-dompdf v2.0.1 php-composer barryvdh/laravel-snappy v1.0.2 php-composer @@ -67,7 +67,7 @@ intervention/image 2.7.2 php-composer itsgoingd/clockwork v5.2.0 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.4.4 php-composer -larastan/larastan v2.9.0 php-composer +larastan/larastan v2.9.1 php-composer laravel/framework v9.52.16 php-composer laravel/serializable-closure v1.3.3 php-composer laravel/socialite v5.12.1 php-composer @@ -90,7 +90,7 @@ libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk libcrypto3 3.1.4-r5 apk libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r0 apk +libdav1d 1.3.0-r1 apk libedit 20230828.3.1-r3 apk libevent 2.1.12-r7 apk libexpat 2.6.0-r0 apk From 22289ce96f679ebcc33f52849db49846055603a3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Mar 2024 18:20:31 +0000 Subject: [PATCH 339/452] Bot Updating Package Versions --- package_versions.txt | 584 +++++++++++++++++++++---------------------- 1 file changed, 292 insertions(+), 292 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index af2f74a..03482e9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,292 +1,292 @@ -NAME VERSION TYPE -Hidden Input 1, 0, 0, 0 dotnet -alpine-baselayout 3.4.3-r2 apk -alpine-baselayout-data 3.4.3-r2 apk -alpine-keys 2.4-r1 apk -alpine-release 3.19.1-r0 apk -aom-libs 3.7.1-r0 apk -apache2-utils 2.4.58-r1 apk -apk-tools 2.14.0-r5 apk -apr 1.7.4-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r5 apk -aws/aws-crt-php v1.2.4 php-composer -aws/aws-sdk-php 3.300.6 php-composer -bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer -bash 5.2.21-r0 apk -brick/math 0.11.0 php-composer -brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r15 apk -busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk -carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.7.1 binary -coreutils 9.4-r2 apk -coreutils-env 9.4-r2 apk -coreutils-fmt 9.4-r2 apk -coreutils-sha512sum 9.4-r2 apk -curl 8.5.0-r0 apk -dasprid/enum 1.0.5 php-composer -dbus-libs 1.14.10-r0 apk -dflydev/dot-access-data v3.0.2 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.8.2 php-composer -doctrine/deprecations 1.1.3 php-composer -doctrine/event-manager 1.2.0 php-composer -doctrine/inflector 2.0.10 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.1 php-composer -dompdf/dompdf v2.0.4 php-composer -dragonmantank/cron-expression v3.3.3 php-composer -egulias/email-validator 3.2.6 php-composer -encodings 1.0.7-r1 apk -fakerphp/faker v1.23.1 php-composer -filp/whoops 2.15.4 php-composer -font-freefont 20120503-r4 apk -fontconfig 2.14.2-r4 apk -freetype 2.13.2-r0 apk -fruitcake/php-cors v1.3.0 php-composer -gdbm 1.23-r1 apk -git 2.43.0-r0 apk -git-perl 2.43.0-r0 apk -glib 2.78.4-r0 apk -graham-campbell/result-type v1.1.2 php-composer -guzzlehttp/guzzle 7.8.1 php-composer -guzzlehttp/promises 2.0.2 php-composer -guzzlehttp/psr7 2.6.2 php-composer -guzzlehttp/uri-template v1.0.3 php-composer -hamcrest/hamcrest-php v2.0.1 php-composer -hiredis 1.2.0-r0 apk -icu-data-full 74.1-r0 apk -icu-libs 74.1-r0 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.2.0 php-composer -jq 1.7.1-r0 apk -knplabs/knp-snappy v1.4.4 php-composer -larastan/larastan v2.9.1 php-composer -laravel/framework v9.52.16 php-composer -laravel/serializable-closure v1.3.3 php-composer -laravel/socialite v5.12.1 php-composer -laravel/tinker v2.9.0 php-composer -league/commonmark 2.4.2 php-composer -league/config v1.2.0 php-composer -league/flysystem 3.24.0 php-composer -league/flysystem-aws-s3-v3 3.24.0 php-composer -league/flysystem-local 3.23.1 php-composer -league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.15.0 php-composer -league/oauth1-client v1.10.1 php-composer -league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r4 apk -libattr 2.5.1-r5 apk -libavif 1.0.3-r0 apk -libblkid 2.39.3-r0 apk -libbsd 0.11.7-r3 apk -libbz2 1.0.8-r6 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r5 apk -libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r1 apk -libedit 20230828.3.1-r3 apk -libevent 2.1.12-r7 apk -libexpat 2.6.0-r0 apk -libffi 3.4.4-r3 apk -libfontenc 1.1.7-r4 apk -libgcc 13.2.1_git20231014-r0 apk -libice 1.1.1-r5 apk -libidn2 2.3.4-r4 apk -libintl 0.22.3-r0 apk -libjpeg-turbo 3.0.1-r0 apk -libldap 2.6.6-r1 apk -libmd 1.1.0-r0 apk -libmemcached-libs 1.1.4-r1 apk -libmount 2.39.3-r0 apk -libncursesw 6.4_p20231125-r0 apk -libpcre2-16 10.42-r2 apk -libpng 1.6.40-r0 apk -libproc2 4.0.4-r0 apk -libsasl 2.1.28-r5 apk -libseccomp 2.5.5-r0 apk -libsharpyuv 1.3.2-r0 apk -libsm 1.2.4-r3 apk -libssl3 3.1.4-r5 apk -libstdc++ 13.2.1_git20231014-r0 apk -libunistring 1.1-r2 apk -libuuid 2.39.3-r0 apk -libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r3 apk -libxcb 1.16-r0 apk -libxdmcp 1.1.4-r3 apk -libxext 1.3.5-r3 apk -libxml2 2.11.7-r0 apk -libxpm 3.5.17-r0 apk -libxt 1.3.0-r4 apk -libzip 1.10.1-r0 apk -linux-pam 1.5.3-r7 apk -logrotate 3.21.0-r1 apk -mariadb-client 10.11.6-r0 apk -mariadb-common 10.11.6-r0 apk -masterminds/html5 2.8.1 php-composer -memcached 1.6.22-r0 apk -mkfontscale 1.2.2-r4 apk -mockery/mockery 1.6.7 php-composer -monolog/monolog 2.9.2 php-composer -mtdowling/jmespath.php 2.7.0 php-composer -musl 1.2.4_git20230717-r4 apk -musl-utils 1.2.4_git20230717-r4 apk -myclabs/deep-copy 1.11.1 php-composer -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20231125-r0 apk -nesbot/carbon 2.72.3 php-composer -netcat-openbsd 1.226-r0 apk -nette/schema v1.2.5 php-composer -nette/utils v4.0.4 php-composer -nghttp2-libs 1.58.0-r0 apk -nginx 1.24.0-r15 apk -nikic/php-parser v5.0.1 php-composer -nunomaduro/collision v6.4.0 php-composer -nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer -oniguruma 6.9.9-r0 apk -openssl 3.1.4-r5 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -pcre 8.45-r3 apk -pcre2 10.42-r2 apk -perl 5.38.2-r0 apk -perl-error 0.17029-r2 apk -perl-git 2.43.0-r0 apk -phar-io/manifest 2.0.3 php-composer -phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.6 php-composer -phenx/php-svg-lib 0.5.2 php-composer -php83 8.3.3-r0 apk -php83-common 8.3.3-r0 apk -php83-ctype 8.3.3-r0 apk -php83-curl 8.3.3-r0 apk -php83-dom 8.3.3-r0 apk -php83-fileinfo 8.3.3-r0 apk -php83-fpm 8.3.3-r0 apk -php83-gd 8.3.3-r0 apk -php83-iconv 8.3.3-r0 apk -php83-ldap 8.3.3-r0 apk -php83-mbstring 8.3.3-r0 apk -php83-mysqlnd 8.3.3-r0 apk -php83-openssl 8.3.3-r0 apk -php83-pdo 8.3.3-r0 apk -php83-pdo_mysql 8.3.3-r0 apk -php83-pecl-igbinary 3.2.15-r0 apk -php83-pecl-memcached 3.2.0-r0 apk -php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.3-r0 apk -php83-session 8.3.3-r0 apk -php83-simplexml 8.3.3-r0 apk -php83-sockets 8.3.3-r0 apk -php83-tokenizer 8.3.3-r0 apk -php83-xml 8.3.3-r0 apk -php83-xmlwriter 8.3.3-r0 apk -php83-zip 8.3.3-r0 apk -phpmyadmin/sql-parser 5.9.0 php-composer -phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.36 php-composer -phpstan/phpstan 1.10.59 php-composer -phpunit/php-code-coverage 9.2.30 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.17 php-composer -popt 1.19-r3 apk -pragmarx/google2fa v8.0.1 php-composer -predis/predis v2.2.2 php-composer -procps-ng 4.0.4-r0 apk -psr/cache 3.0.0 php-composer -psr/clock 1.0.0 php-composer -psr/container 2.0.2 php-composer -psr/event-dispatcher 1.0.0 php-composer -psr/http-client 1.0.3 php-composer -psr/http-factory 1.0.2 php-composer -psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer -psr/simple-cache 3.0.0 php-composer -psy/psysh v0.12.0 php-composer -qt5-qtbase 5.15.10_git20230714-r2 apk -ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.5 php-composer -readline 8.2.1-r2 apk -robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser v8.5.1 php-composer -scanelf 1.3.7-r2 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.3 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.6 php-composer -sebastian/lines-of-code 1.0.4 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer -shadow 4.14.2-r0 apk -skalibs 2.14.0.1-r0 apk -socialiteproviders/discord 4.2.0 php-composer -socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.5.1 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer -socialiteproviders/okta 4.4.0 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.9.0 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssddanbrown/symfony-mailer 6.0.x-dev php-composer -ssl_client 1.36.1-r15 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mime v6.0.19 php-composer -symfony/polyfill-ctype v1.29.0 php-composer -symfony/polyfill-intl-grapheme v1.29.0 php-composer -symfony/polyfill-intl-idn v1.29.0 php-composer -symfony/polyfill-intl-normalizer v1.29.0 php-composer -symfony/polyfill-mbstring v1.29.0 php-composer -symfony/polyfill-php72 v1.29.0 php-composer -symfony/polyfill-php80 v1.29.0 php-composer -symfony/polyfill-php81 v1.29.0 php-composer -symfony/polyfill-uuid v1.29.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.2 php-composer -tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2024a-r0 apk -utmps-libs 0.1.2.2-r0 apk -vlucas/phpdotenv v5.6.0 php-composer -voku/portable-ascii 2.0.1 php-composer -webmozart/assert 1.11.0 php-composer -xz-libs 5.4.5-r0 apk -zlib 1.3.1-r0 apk -zstd-libs 1.5.5-r8 apk +NAME VERSION TYPE +Hidden Input 1, 0, 0, 0 dotnet +alpine-baselayout 3.4.3-r2 apk +alpine-baselayout-data 3.4.3-r2 apk +alpine-keys 2.4-r1 apk +alpine-release 3.19.1-r0 apk +aom-libs 3.7.1-r0 apk +apache2-utils 2.4.58-r1 apk +apk-tools 2.14.0-r5 apk +apr 1.7.4-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r5 apk +aws/aws-crt-php v1.2.4 php-composer +aws/aws-sdk-php 3.300.6 php-composer +bacon/bacon-qr-code 2.0.8 php-composer +barryvdh/laravel-dompdf v2.0.1 php-composer +barryvdh/laravel-snappy v1.0.2 php-composer +bash 5.2.21-r0 apk +brick/math 0.11.0 php-composer +brotli-libs 1.1.0-r1 apk +busybox 1.36.1-r15 apk +busybox-binsh 1.36.1-r15 apk +c-ares 1.24.0-r1 apk +ca-certificates 20230506-r0 apk +ca-certificates-bundle 20230506-r0 apk +carbonphp/carbon-doctrine-types 2.1.0 php-composer +composer 2.7.1 binary +coreutils 9.4-r2 apk +coreutils-env 9.4-r2 apk +coreutils-fmt 9.4-r2 apk +coreutils-sha512sum 9.4-r2 apk +curl 8.5.0-r0 apk +dasprid/enum 1.0.5 php-composer +dbus-libs 1.14.10-r0 apk +dflydev/dot-access-data v3.0.2 php-composer +doctrine/cache 2.2.0 php-composer +doctrine/dbal 3.8.2 php-composer +doctrine/deprecations 1.1.3 php-composer +doctrine/event-manager 1.2.0 php-composer +doctrine/inflector 2.0.10 php-composer +doctrine/instantiator 1.5.0 php-composer +doctrine/lexer 2.1.1 php-composer +dompdf/dompdf v2.0.4 php-composer +dragonmantank/cron-expression v3.3.3 php-composer +egulias/email-validator 3.2.6 php-composer +encodings 1.0.7-r1 apk +fakerphp/faker v1.23.1 php-composer +filp/whoops 2.15.4 php-composer +font-freefont 20120503-r4 apk +fontconfig 2.14.2-r4 apk +freetype 2.13.2-r0 apk +fruitcake/php-cors v1.3.0 php-composer +gdbm 1.23-r1 apk +git 2.43.0-r0 apk +git-perl 2.43.0-r0 apk +glib 2.78.4-r0 apk +graham-campbell/result-type v1.1.2 php-composer +guzzlehttp/guzzle 7.8.1 php-composer +guzzlehttp/promises 2.0.2 php-composer +guzzlehttp/psr7 2.6.2 php-composer +guzzlehttp/uri-template v1.0.3 php-composer +hamcrest/hamcrest-php v2.0.1 php-composer +hiredis 1.2.0-r0 apk +icu-data-full 74.1-r0 apk +icu-libs 74.1-r0 apk +intervention/image 2.7.2 php-composer +itsgoingd/clockwork v5.2.0 php-composer +jq 1.7.1-r0 apk +knplabs/knp-snappy v1.4.4 php-composer +larastan/larastan v2.9.1 php-composer +laravel/framework v9.52.16 php-composer +laravel/serializable-closure v1.3.3 php-composer +laravel/socialite v5.12.1 php-composer +laravel/tinker v2.9.0 php-composer +league/commonmark 2.4.2 php-composer +league/config v1.2.0 php-composer +league/flysystem 3.24.0 php-composer +league/flysystem-aws-s3-v3 3.24.0 php-composer +league/flysystem-local 3.23.1 php-composer +league/html-to-markdown 5.1.1 php-composer +league/mime-type-detection 1.15.0 php-composer +league/oauth1-client v1.10.1 php-composer +league/oauth2-client 2.7.0 php-composer +libacl 2.3.1-r4 apk +libattr 2.5.1-r5 apk +libavif 1.0.3-r0 apk +libblkid 2.39.3-r0 apk +libbsd 0.11.7-r3 apk +libbz2 1.0.8-r6 apk +libc-utils 0.7.2-r5 apk +libcrypto3 3.1.4-r5 apk +libcurl 8.5.0-r0 apk +libdav1d 1.3.0-r1 apk +libedit 20230828.3.1-r3 apk +libevent 2.1.12-r7 apk +libexpat 2.6.0-r0 apk +libffi 3.4.4-r3 apk +libfontenc 1.1.7-r4 apk +libgcc 13.2.1_git20231014-r0 apk +libice 1.1.1-r5 apk +libidn2 2.3.4-r4 apk +libintl 0.22.3-r0 apk +libjpeg-turbo 3.0.1-r0 apk +libldap 2.6.6-r1 apk +libmd 1.1.0-r0 apk +libmemcached-libs 1.1.4-r1 apk +libmount 2.39.3-r0 apk +libncursesw 6.4_p20231125-r0 apk +libpcre2-16 10.42-r2 apk +libpng 1.6.40-r0 apk +libproc2 4.0.4-r0 apk +libsasl 2.1.28-r5 apk +libseccomp 2.5.5-r0 apk +libsharpyuv 1.3.2-r0 apk +libsm 1.2.4-r3 apk +libssl3 3.1.4-r5 apk +libstdc++ 13.2.1_git20231014-r0 apk +libunistring 1.1-r2 apk +libuuid 2.39.3-r0 apk +libwebp 1.3.2-r0 apk +libx11 1.8.7-r0 apk +libxau 1.0.11-r3 apk +libxcb 1.16-r0 apk +libxdmcp 1.1.4-r3 apk +libxext 1.3.5-r3 apk +libxml2 2.11.7-r0 apk +libxpm 3.5.17-r0 apk +libxt 1.3.0-r4 apk +libzip 1.10.1-r0 apk +linux-pam 1.5.3-r7 apk +logrotate 3.21.0-r1 apk +mariadb-client 10.11.6-r0 apk +mariadb-common 10.11.6-r0 apk +masterminds/html5 2.8.1 php-composer +memcached 1.6.22-r0 apk +mkfontscale 1.2.2-r4 apk +mockery/mockery 1.6.7 php-composer +monolog/monolog 2.9.2 php-composer +mtdowling/jmespath.php 2.7.0 php-composer +musl 1.2.4_git20230717-r4 apk +musl-utils 1.2.4_git20230717-r4 apk +myclabs/deep-copy 1.11.1 php-composer +nano 7.2-r1 apk +ncurses-terminfo-base 6.4_p20231125-r0 apk +nesbot/carbon 2.72.3 php-composer +netcat-openbsd 1.226-r0 apk +nette/schema v1.2.5 php-composer +nette/utils v4.0.4 php-composer +nghttp2-libs 1.58.0-r0 apk +nginx 1.24.0-r15 apk +nikic/php-parser v5.0.1 php-composer +nunomaduro/collision v6.4.0 php-composer +nunomaduro/termwind v1.15.1 php-composer +onelogin/php-saml 4.1.0 php-composer +oniguruma 6.9.9-r0 apk +openssl 3.1.4-r5 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +pcre 8.45-r3 apk +pcre2 10.42-r2 apk +perl 5.38.2-r0 apk +perl-error 0.17029-r2 apk +perl-git 2.43.0-r0 apk +phar-io/manifest 2.0.3 php-composer +phar-io/version 3.2.1 php-composer +phenx/php-font-lib 0.5.6 php-composer +phenx/php-svg-lib 0.5.2 php-composer +php83 8.3.3-r0 apk +php83-common 8.3.3-r0 apk +php83-ctype 8.3.3-r0 apk +php83-curl 8.3.3-r0 apk +php83-dom 8.3.3-r0 apk +php83-fileinfo 8.3.3-r0 apk +php83-fpm 8.3.3-r0 apk +php83-gd 8.3.3-r0 apk +php83-iconv 8.3.3-r0 apk +php83-ldap 8.3.3-r0 apk +php83-mbstring 8.3.3-r0 apk +php83-mysqlnd 8.3.3-r0 apk +php83-openssl 8.3.3-r0 apk +php83-pdo 8.3.3-r0 apk +php83-pdo_mysql 8.3.3-r0 apk +php83-pecl-igbinary 3.2.15-r0 apk +php83-pecl-memcached 3.2.0-r0 apk +php83-pecl-msgpack 2.2.0-r1 apk +php83-phar 8.3.3-r0 apk +php83-session 8.3.3-r0 apk +php83-simplexml 8.3.3-r0 apk +php83-sockets 8.3.3-r0 apk +php83-tokenizer 8.3.3-r0 apk +php83-xml 8.3.3-r0 apk +php83-xmlwriter 8.3.3-r0 apk +php83-zip 8.3.3-r0 apk +phpmyadmin/sql-parser 5.9.0 php-composer +phpoption/phpoption 1.9.2 php-composer +phpseclib/phpseclib 3.0.36 php-composer +phpstan/phpstan 1.10.59 php-composer +phpunit/php-code-coverage 9.2.30 php-composer +phpunit/php-file-iterator 3.0.6 php-composer +phpunit/php-invoker 3.1.1 php-composer +phpunit/php-text-template 2.0.4 php-composer +phpunit/php-timer 5.0.3 php-composer +phpunit/phpunit 9.6.17 php-composer +popt 1.19-r3 apk +pragmarx/google2fa v8.0.1 php-composer +predis/predis v2.2.2 php-composer +procps-ng 4.0.4-r0 apk +psr/cache 3.0.0 php-composer +psr/clock 1.0.0 php-composer +psr/container 2.0.2 php-composer +psr/event-dispatcher 1.0.0 php-composer +psr/http-client 1.0.3 php-composer +psr/http-factory 1.0.2 php-composer +psr/http-message 2.0 php-composer +psr/log 3.0.0 php-composer +psr/simple-cache 3.0.0 php-composer +psy/psysh v0.12.0 php-composer +qt5-qtbase 5.15.10_git20230714-r2 apk +ralouphie/getallheaders 3.0.3 php-composer +ramsey/collection 1.3.0 php-composer +ramsey/uuid 4.7.5 php-composer +readline 8.2.1-r2 apk +robrichards/xmlseclibs 3.1.1 php-composer +sabberworm/php-css-parser v8.5.1 php-composer +scanelf 1.3.7-r2 apk +sebastian/cli-parser 1.0.1 php-composer +sebastian/code-unit 1.0.8 php-composer +sebastian/code-unit-reverse-lookup 2.0.3 php-composer +sebastian/comparator 4.0.8 php-composer +sebastian/complexity 2.0.3 php-composer +sebastian/diff 4.0.5 php-composer +sebastian/environment 5.1.5 php-composer +sebastian/exporter 4.0.5 php-composer +sebastian/global-state 5.0.6 php-composer +sebastian/lines-of-code 1.0.4 php-composer +sebastian/object-enumerator 4.0.4 php-composer +sebastian/object-reflector 2.0.4 php-composer +sebastian/recursion-context 4.0.5 php-composer +sebastian/resource-operations 3.0.3 php-composer +sebastian/type 3.2.1 php-composer +sebastian/version 3.0.2 php-composer +shadow 4.14.2-r0 apk +skalibs 2.14.0.1-r0 apk +socialiteproviders/discord 4.2.0 php-composer +socialiteproviders/gitlab 4.1.0 php-composer +socialiteproviders/manager v4.5.1 php-composer +socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/okta 4.4.0 php-composer +socialiteproviders/twitch 5.3.1 php-composer +squizlabs/php_codesniffer 3.9.0 php-composer +ssddanbrown/asserthtml v2.0.0 php-composer +ssddanbrown/htmldiff v1.0.2 php-composer +ssddanbrown/symfony-mailer 6.0.x-dev php-composer +ssl_client 1.36.1-r15 apk +symfony/console v6.0.19 php-composer +symfony/css-selector v6.0.19 php-composer +symfony/deprecation-contracts v3.0.2 php-composer +symfony/dom-crawler v6.0.19 php-composer +symfony/error-handler v6.0.19 php-composer +symfony/event-dispatcher v6.0.19 php-composer +symfony/event-dispatcher-contracts v3.0.2 php-composer +symfony/finder v6.0.19 php-composer +symfony/http-foundation v6.0.20 php-composer +symfony/http-kernel v6.0.20 php-composer +symfony/mime v6.0.19 php-composer +symfony/polyfill-ctype v1.29.0 php-composer +symfony/polyfill-intl-grapheme v1.29.0 php-composer +symfony/polyfill-intl-idn v1.29.0 php-composer +symfony/polyfill-intl-normalizer v1.29.0 php-composer +symfony/polyfill-mbstring v1.29.0 php-composer +symfony/polyfill-php72 v1.29.0 php-composer +symfony/polyfill-php80 v1.29.0 php-composer +symfony/polyfill-php81 v1.29.0 php-composer +symfony/polyfill-uuid v1.29.0 php-composer +symfony/process v6.0.19 php-composer +symfony/routing v6.0.19 php-composer +symfony/service-contracts v3.0.2 php-composer +symfony/string v6.0.19 php-composer +symfony/translation v6.0.19 php-composer +symfony/translation-contracts v3.0.2 php-composer +symfony/uid v6.0.19 php-composer +symfony/var-dumper v6.0.19 php-composer +theseer/tokenizer 1.2.2 php-composer +tijsverkoyen/css-to-inline-styles v2.2.7 php-composer +tzdata 2024a-r0 apk +utmps-libs 0.1.2.2-r0 apk +vlucas/phpdotenv v5.6.0 php-composer +voku/portable-ascii 2.0.1 php-composer +webmozart/assert 1.11.0 php-composer +xz-libs 5.4.5-r0 apk +zlib 1.3.1-r0 apk +zstd-libs 1.5.5-r8 apk From ef1f4e2139d47fc22e3168899e0a0a03b6913d0a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 18 Mar 2024 18:20:07 +0000 Subject: [PATCH 340/452] Bot Updating Templated Files --- Jenkinsfile | 61 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 87b8ed2..06d3823 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -278,8 +278,15 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update + # Cloned repo paths for templating: + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github + # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos + # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github + git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} @@ -291,13 +298,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" + echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "Jenkinsfile is up to date." fi - # Stage 2 - Delete old templates + echo "Starting Stage 2 - Delete old templates" OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then @@ -316,13 +323,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" + echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "No templates to delete" fi - # Stage 3 - Update templates + echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -346,9 +353,14 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "No templates to update" fi + echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then @@ -356,6 +368,7 @@ pipeline { cd ${TEMPDIR}/docs/docker-documentation GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') git add docs/images/docker-${CONTAINER_NAME}.md + echo "Updating docs repo" git commit -m 'Bot Updating Documentation' git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ @@ -363,6 +376,8 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + else + echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates @@ -373,6 +388,7 @@ pipeline { sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml fi if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then @@ -392,16 +408,27 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}) + else + echo "No updates to Unraid template needed, skipping" fi - # Stage 4 - Sync Readme to Docker Hub if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else echo "Syncing readme to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi + if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then + echo "Docker Hub endpoint doesn't exist. Creating endpoint first." + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X POST \ + -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \ + https://hub.docker.com/v2/repositories/ || : + fi DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') curl -s \ -H "Authorization: JWT ${DH_TOKEN}" \ @@ -466,14 +493,16 @@ pipeline { } steps{ sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ + -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' } } /* ############### From b24b21f21c77427bea4d5c02b3bbbe48201ce387 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 18 Mar 2024 18:23:08 +0000 Subject: [PATCH 341/452] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 03482e9..1d9b980 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ c-ares 1.24.0-r1 apk ca-certificates 20230506-r0 apk ca-certificates-bundle 20230506-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.7.1 binary +composer 2.7.2 binary coreutils 9.4-r2 apk coreutils-env 9.4-r2 apk coreutils-fmt 9.4-r2 apk @@ -165,32 +165,32 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.2 php-composer -php83 8.3.3-r0 apk -php83-common 8.3.3-r0 apk -php83-ctype 8.3.3-r0 apk -php83-curl 8.3.3-r0 apk -php83-dom 8.3.3-r0 apk -php83-fileinfo 8.3.3-r0 apk -php83-fpm 8.3.3-r0 apk -php83-gd 8.3.3-r0 apk -php83-iconv 8.3.3-r0 apk -php83-ldap 8.3.3-r0 apk -php83-mbstring 8.3.3-r0 apk -php83-mysqlnd 8.3.3-r0 apk -php83-openssl 8.3.3-r0 apk -php83-pdo 8.3.3-r0 apk -php83-pdo_mysql 8.3.3-r0 apk +php83 8.3.4-r0 apk +php83-common 8.3.4-r0 apk +php83-ctype 8.3.4-r0 apk +php83-curl 8.3.4-r0 apk +php83-dom 8.3.4-r0 apk +php83-fileinfo 8.3.4-r0 apk +php83-fpm 8.3.4-r0 apk +php83-gd 8.3.4-r0 apk +php83-iconv 8.3.4-r0 apk +php83-ldap 8.3.4-r0 apk +php83-mbstring 8.3.4-r0 apk +php83-mysqlnd 8.3.4-r0 apk +php83-openssl 8.3.4-r0 apk +php83-pdo 8.3.4-r0 apk +php83-pdo_mysql 8.3.4-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.3-r0 apk -php83-session 8.3.3-r0 apk -php83-simplexml 8.3.3-r0 apk -php83-sockets 8.3.3-r0 apk -php83-tokenizer 8.3.3-r0 apk -php83-xml 8.3.3-r0 apk -php83-xmlwriter 8.3.3-r0 apk -php83-zip 8.3.3-r0 apk +php83-phar 8.3.4-r0 apk +php83-session 8.3.4-r0 apk +php83-simplexml 8.3.4-r0 apk +php83-sockets 8.3.4-r0 apk +php83-tokenizer 8.3.4-r0 apk +php83-xml 8.3.4-r0 apk +php83-xmlwriter 8.3.4-r0 apk +php83-zip 8.3.4-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.36 php-composer From ef62a56bab477f8c2641d0034ab7246cea10cc5d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Mar 2024 18:24:37 +0000 Subject: [PATCH 342/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 1d9b980..2c99a1b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,7 +93,7 @@ libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libedit 20230828.3.1-r3 apk libevent 2.1.12-r7 apk -libexpat 2.6.0-r0 apk +libexpat 2.6.2-r0 apk libffi 3.4.4-r3 apk libfontenc 1.1.7-r4 apk libgcc 13.2.1_git20231014-r0 apk From 248b7be39725aa881946507df562cc5ddfacd260 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 Apr 2024 18:21:02 +0000 Subject: [PATCH 343/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2c99a1b..0a69fe9 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -21,8 +21,8 @@ brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk c-ares 1.24.0-r1 apk -ca-certificates 20230506-r0 apk -ca-certificates-bundle 20230506-r0 apk +ca-certificates 20240226-r0 apk +ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer composer 2.7.2 binary coreutils 9.4-r2 apk From efa77507f36000affd021c3c15c2051ed50e3ba3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 5 Apr 2024 14:34:15 +0000 Subject: [PATCH 344/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0a69fe9..21ada1f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -20,7 +20,7 @@ brick/math 0.11.0 php-composer brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk -c-ares 1.24.0-r1 apk +c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer From 8fddd56c0c7650a88af3675415cdb8aeb56bd960 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 15 Apr 2024 18:23:15 +0000 Subject: [PATCH 345/452] Bot Updating Package Versions --- package_versions.txt | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 21ada1f..e298488 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,8 +5,8 @@ alpine-baselayout-data 3.4.3-r2 apk alpine-keys 2.4-r1 apk alpine-release 3.19.1-r0 apk aom-libs 3.7.1-r0 apk -apache2-utils 2.4.58-r1 apk -apk-tools 2.14.0-r5 apk +apache2-utils 2.4.59-r0 apk +apk-tools 2.14.3-r1 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -88,7 +88,7 @@ libblkid 2.39.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r5 apk +libcrypto3 3.1.4-r6 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libedit 20230828.3.1-r3 apk @@ -113,7 +113,7 @@ libsasl 2.1.28-r5 apk libseccomp 2.5.5-r0 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r5 apk +libssl3 3.1.4-r6 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -153,7 +153,7 @@ nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r5 apk +openssl 3.1.4-r6 apk paragonie/constant_time_encoding v2.6.3 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -165,32 +165,32 @@ phar-io/manifest 2.0.3 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.2 php-composer -php83 8.3.4-r0 apk -php83-common 8.3.4-r0 apk -php83-ctype 8.3.4-r0 apk -php83-curl 8.3.4-r0 apk -php83-dom 8.3.4-r0 apk -php83-fileinfo 8.3.4-r0 apk -php83-fpm 8.3.4-r0 apk -php83-gd 8.3.4-r0 apk -php83-iconv 8.3.4-r0 apk -php83-ldap 8.3.4-r0 apk -php83-mbstring 8.3.4-r0 apk -php83-mysqlnd 8.3.4-r0 apk -php83-openssl 8.3.4-r0 apk -php83-pdo 8.3.4-r0 apk -php83-pdo_mysql 8.3.4-r0 apk +php83 8.3.6-r0 apk +php83-common 8.3.6-r0 apk +php83-ctype 8.3.6-r0 apk +php83-curl 8.3.6-r0 apk +php83-dom 8.3.6-r0 apk +php83-fileinfo 8.3.6-r0 apk +php83-fpm 8.3.6-r0 apk +php83-gd 8.3.6-r0 apk +php83-iconv 8.3.6-r0 apk +php83-ldap 8.3.6-r0 apk +php83-mbstring 8.3.6-r0 apk +php83-mysqlnd 8.3.6-r0 apk +php83-openssl 8.3.6-r0 apk +php83-pdo 8.3.6-r0 apk +php83-pdo_mysql 8.3.6-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.4-r0 apk -php83-session 8.3.4-r0 apk -php83-simplexml 8.3.4-r0 apk -php83-sockets 8.3.4-r0 apk -php83-tokenizer 8.3.4-r0 apk -php83-xml 8.3.4-r0 apk -php83-xmlwriter 8.3.4-r0 apk -php83-zip 8.3.4-r0 apk +php83-phar 8.3.6-r0 apk +php83-session 8.3.6-r0 apk +php83-simplexml 8.3.6-r0 apk +php83-sockets 8.3.6-r0 apk +php83-tokenizer 8.3.6-r0 apk +php83-xml 8.3.6-r0 apk +php83-xmlwriter 8.3.6-r0 apk +php83-zip 8.3.6-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.36 php-composer From 263fc819523656fd56b308a4d548adeef6ed7973 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 22 Apr 2024 18:23:05 +0000 Subject: [PATCH 346/452] Bot Updating Package Versions --- package_versions.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index e298488..2c24081 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ alpine-keys 2.4-r1 apk alpine-release 3.19.1-r0 apk aom-libs 3.7.1-r0 apk apache2-utils 2.4.59-r0 apk -apk-tools 2.14.3-r1 apk +apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -46,6 +46,7 @@ egulias/email-validator 3.2.6 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.1 php-composer filp/whoops 2.15.4 php-composer +findutils 4.9.0-r5 apk font-freefont 20120503-r4 apk fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk From 93878ef58548626baaa31f505b9ea2d32353b0d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Apr 2024 18:22:17 +0000 Subject: [PATCH 347/452] Bot Updating Package Versions --- package_versions.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2c24081..5cf0d85 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.7.2 binary +composer 2.7.4 binary coreutils 9.4-r2 apk coreutils-env 9.4-r2 apk coreutils-fmt 9.4-r2 apk @@ -61,7 +61,6 @@ guzzlehttp/promises 2.0.2 php-composer guzzlehttp/psr7 2.6.2 php-composer guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -hiredis 1.2.0-r0 apk icu-data-full 74.1-r0 apk icu-libs 74.1-r0 apk intervention/image 2.7.2 php-composer @@ -148,7 +147,7 @@ netcat-openbsd 1.226-r0 apk nette/schema v1.2.5 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.58.0-r0 apk -nginx 1.24.0-r15 apk +nginx 1.24.0-r16 apk nikic/php-parser v5.0.1 php-composer nunomaduro/collision v6.4.0 php-composer nunomaduro/termwind v1.15.1 php-composer From 4864ce1d1e5419da43c8d1d1d13a08e070685cd2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 6 May 2024 18:24:36 +0000 Subject: [PATCH 348/452] Bot Updating Templated Files --- Jenkinsfile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 06d3823..0857417 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -285,7 +285,7 @@ pipeline { # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} - docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo @@ -392,11 +392,15 @@ pipeline { cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : + if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : + else + echo "Image is on the ignore list, but no template exist, skipping deprecation" + fi else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml @@ -618,7 +622,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} From bd9f41e79395bd757e119b3f980b40401112ce7c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 May 2024 15:28:25 +0000 Subject: [PATCH 349/452] Bot Updating Templated Files --- Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0857417..d95d26b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -391,16 +391,14 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - if [[ -f ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ]]; then - echo "Image is on the ignore list, marking Unraid template as deprecated" - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ - git add -u unraid/${CONTAINER_NAME}.xml - git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Moving Deprecated Unraid Template' || : - else - echo "Image is on the ignore list, but no template exist, skipping deprecation" - fi + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + echo "Image is on the ignore list, and already in the deprecation folder." + elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml From e03366e936787e9e4f9ac302b54f2df1942275ba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 11 May 2024 15:31:12 +0000 Subject: [PATCH 350/452] Bot Updating Package Versions --- package_versions.txt | 216 +++++++++++++++++++++---------------------- 1 file changed, 108 insertions(+), 108 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5cf0d85..d0efd47 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,13 +10,11 @@ apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk -aws/aws-crt-php v1.2.4 php-composer -aws/aws-sdk-php 3.300.6 php-composer +aws/aws-crt-php v1.2.5 php-composer +aws/aws-sdk-php 3.305.9 php-composer bacon/bacon-qr-code 2.0.8 php-composer -barryvdh/laravel-dompdf v2.0.1 php-composer -barryvdh/laravel-snappy v1.0.2 php-composer bash 5.2.21-r0 apk -brick/math 0.11.0 php-composer +brick/math 0.12.1 php-composer brotli-libs 1.1.0-r1 apk busybox 1.36.1-r15 apk busybox-binsh 1.36.1-r15 apk @@ -24,7 +22,8 @@ c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer -composer 2.7.4 binary +catatonit 0.2.0-r0 apk +composer 2.7.6 binary coreutils 9.4-r2 apk coreutils-env 9.4-r2 apk coreutils-fmt 9.4-r2 apk @@ -34,19 +33,19 @@ dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r0 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.8.2 php-composer +doctrine/dbal 3.8.4 php-composer doctrine/deprecations 1.1.3 php-composer -doctrine/event-manager 1.2.0 php-composer +doctrine/event-manager 2.0.0 php-composer doctrine/inflector 2.0.10 php-composer -doctrine/instantiator 1.5.0 php-composer -doctrine/lexer 2.1.1 php-composer -dompdf/dompdf v2.0.4 php-composer +doctrine/lexer 3.0.1 php-composer +dompdf/dompdf v2.0.8 php-composer dragonmantank/cron-expression v3.3.3 php-composer -egulias/email-validator 3.2.6 php-composer +egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.1 php-composer filp/whoops 2.15.4 php-composer findutils 4.9.0-r5 apk +firebase/php-jwt v6.10.0 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk @@ -54,7 +53,7 @@ fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk git 2.43.0-r0 apk git-perl 2.43.0-r0 apk -glib 2.78.4-r0 apk +glib 2.78.5-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer guzzlehttp/promises 2.0.2 php-composer @@ -63,20 +62,22 @@ guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.1-r0 apk icu-libs 74.1-r0 apk -intervention/image 2.7.2 php-composer -itsgoingd/clockwork v5.2.0 php-composer +intervention/gif 4.1.0 php-composer +intervention/image 3.6.3 php-composer +itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk -knplabs/knp-snappy v1.4.4 php-composer -larastan/larastan v2.9.1 php-composer -laravel/framework v9.52.16 php-composer +knplabs/knp-snappy v1.5.0 php-composer +larastan/larastan v2.9.5 php-composer +laravel/framework v10.48.10 php-composer +laravel/prompts v0.1.21 php-composer laravel/serializable-closure v1.3.3 php-composer -laravel/socialite v5.12.1 php-composer +laravel/socialite v5.13.2 php-composer laravel/tinker v2.9.0 php-composer league/commonmark 2.4.2 php-composer league/config v1.2.0 php-composer -league/flysystem 3.24.0 php-composer -league/flysystem-aws-s3-v3 3.24.0 php-composer -league/flysystem-local 3.23.1 php-composer +league/flysystem 3.27.0 php-composer +league/flysystem-aws-s3-v3 3.27.0 php-composer +league/flysystem-local 3.25.1 php-composer league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.15.0 php-composer league/oauth1-client v1.10.1 php-composer @@ -131,11 +132,11 @@ linux-pam 1.5.3-r7 apk logrotate 3.21.0-r1 apk mariadb-client 10.11.6-r0 apk mariadb-common 10.11.6-r0 apk -masterminds/html5 2.8.1 php-composer +masterminds/html5 2.9.0 php-composer memcached 1.6.22-r0 apk mkfontscale 1.2.2-r4 apk -mockery/mockery 1.6.7 php-composer -monolog/monolog 2.9.2 php-composer +mockery/mockery 1.6.11 php-composer +monolog/monolog 3.6.0 php-composer mtdowling/jmespath.php 2.7.0 php-composer musl 1.2.4_git20230717-r4 apk musl-utils 1.2.4_git20230717-r4 apk @@ -144,12 +145,12 @@ nano 7.2-r1 apk ncurses-terminfo-base 6.4_p20231125-r0 apk nesbot/carbon 2.72.3 php-composer netcat-openbsd 1.226-r0 apk -nette/schema v1.2.5 php-composer +nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.58.0-r0 apk nginx 1.24.0-r16 apk -nikic/php-parser v5.0.1 php-composer -nunomaduro/collision v6.4.0 php-composer +nikic/php-parser v5.0.2 php-composer +nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk @@ -161,46 +162,46 @@ pcre2 10.42-r2 apk perl 5.38.2-r0 apk perl-error 0.17029-r2 apk perl-git 2.43.0-r0 apk -phar-io/manifest 2.0.3 php-composer +phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer -phenx/php-svg-lib 0.5.2 php-composer -php83 8.3.6-r0 apk -php83-common 8.3.6-r0 apk -php83-ctype 8.3.6-r0 apk -php83-curl 8.3.6-r0 apk -php83-dom 8.3.6-r0 apk -php83-fileinfo 8.3.6-r0 apk -php83-fpm 8.3.6-r0 apk -php83-gd 8.3.6-r0 apk -php83-iconv 8.3.6-r0 apk -php83-ldap 8.3.6-r0 apk -php83-mbstring 8.3.6-r0 apk -php83-mysqlnd 8.3.6-r0 apk -php83-openssl 8.3.6-r0 apk -php83-pdo 8.3.6-r0 apk -php83-pdo_mysql 8.3.6-r0 apk +phenx/php-svg-lib 0.5.4 php-composer +php83 8.3.7-r0 apk +php83-common 8.3.7-r0 apk +php83-ctype 8.3.7-r0 apk +php83-curl 8.3.7-r0 apk +php83-dom 8.3.7-r0 apk +php83-fileinfo 8.3.7-r0 apk +php83-fpm 8.3.7-r0 apk +php83-gd 8.3.7-r0 apk +php83-iconv 8.3.7-r0 apk +php83-ldap 8.3.7-r0 apk +php83-mbstring 8.3.7-r0 apk +php83-mysqlnd 8.3.7-r0 apk +php83-openssl 8.3.7-r0 apk +php83-pdo 8.3.7-r0 apk +php83-pdo_mysql 8.3.7-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.6-r0 apk -php83-session 8.3.6-r0 apk -php83-simplexml 8.3.6-r0 apk -php83-sockets 8.3.6-r0 apk -php83-tokenizer 8.3.6-r0 apk -php83-xml 8.3.6-r0 apk -php83-xmlwriter 8.3.6-r0 apk -php83-zip 8.3.6-r0 apk +php83-phar 8.3.7-r0 apk +php83-session 8.3.7-r0 apk +php83-simplexml 8.3.7-r0 apk +php83-sockets 8.3.7-r0 apk +php83-tokenizer 8.3.7-r0 apk +php83-xml 8.3.7-r0 apk +php83-xmlwriter 8.3.7-r0 apk +php83-zip 8.3.7-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.36 php-composer -phpstan/phpstan 1.10.59 php-composer -phpunit/php-code-coverage 9.2.30 php-composer -phpunit/php-file-iterator 3.0.6 php-composer -phpunit/php-invoker 3.1.1 php-composer -phpunit/php-text-template 2.0.4 php-composer -phpunit/php-timer 5.0.3 php-composer -phpunit/phpunit 9.6.17 php-composer +phpseclib/phpseclib 3.0.37 php-composer +phpstan/phpstan 1.10.67 php-composer +phpunit/php-code-coverage 10.1.14 php-composer +phpunit/php-file-iterator 4.1.0 php-composer +phpunit/php-invoker 4.0.0 php-composer +phpunit/php-text-template 3.0.1 php-composer +phpunit/php-timer 6.0.0 php-composer +phpunit/phpunit 10.5.20 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -214,55 +215,54 @@ psr/http-factory 1.0.2 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.12.0 php-composer +psy/psysh v0.12.3 php-composer qt5-qtbase 5.15.10_git20230714-r2 apk ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 1.3.0 php-composer -ramsey/uuid 4.7.5 php-composer +ramsey/collection 2.0.0 php-composer +ramsey/uuid 4.7.6 php-composer readline 8.2.1-r2 apk robrichards/xmlseclibs 3.1.1 php-composer sabberworm/php-css-parser v8.5.1 php-composer scanelf 1.3.7-r2 apk -sebastian/cli-parser 1.0.1 php-composer -sebastian/code-unit 1.0.8 php-composer -sebastian/code-unit-reverse-lookup 2.0.3 php-composer -sebastian/comparator 4.0.8 php-composer -sebastian/complexity 2.0.3 php-composer -sebastian/diff 4.0.5 php-composer -sebastian/environment 5.1.5 php-composer -sebastian/exporter 4.0.5 php-composer -sebastian/global-state 5.0.6 php-composer -sebastian/lines-of-code 1.0.4 php-composer -sebastian/object-enumerator 4.0.4 php-composer -sebastian/object-reflector 2.0.4 php-composer -sebastian/recursion-context 4.0.5 php-composer -sebastian/resource-operations 3.0.3 php-composer -sebastian/type 3.2.1 php-composer -sebastian/version 3.0.2 php-composer +sebastian/cli-parser 2.0.1 php-composer +sebastian/code-unit 2.0.0 php-composer +sebastian/code-unit-reverse-lookup 3.0.0 php-composer +sebastian/comparator 5.0.1 php-composer +sebastian/complexity 3.2.0 php-composer +sebastian/diff 5.1.1 php-composer +sebastian/environment 6.1.0 php-composer +sebastian/exporter 5.1.2 php-composer +sebastian/global-state 6.0.2 php-composer +sebastian/lines-of-code 2.0.2 php-composer +sebastian/object-enumerator 5.0.0 php-composer +sebastian/object-reflector 3.0.0 php-composer +sebastian/recursion-context 5.0.0 php-composer +sebastian/type 4.0.0 php-composer +sebastian/version 4.0.1 php-composer shadow 4.14.2-r0 apk skalibs 2.14.0.1-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.5.1 php-composer -socialiteproviders/microsoft-azure 5.1.0 php-composer +socialiteproviders/manager v4.6.0 php-composer +socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer -socialiteproviders/twitch 5.3.1 php-composer -squizlabs/php_codesniffer 3.9.0 php-composer -ssddanbrown/asserthtml v2.0.0 php-composer -ssddanbrown/htmldiff v1.0.2 php-composer -ssddanbrown/symfony-mailer 6.0.x-dev php-composer +socialiteproviders/twitch 5.4.0 php-composer +squizlabs/php_codesniffer 3.9.2 php-composer +ssddanbrown/asserthtml v3.0.0 php-composer +ssddanbrown/htmldiff v1.0.3 php-composer +ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r15 apk -symfony/console v6.0.19 php-composer -symfony/css-selector v6.0.19 php-composer -symfony/deprecation-contracts v3.0.2 php-composer -symfony/dom-crawler v6.0.19 php-composer -symfony/error-handler v6.0.19 php-composer -symfony/event-dispatcher v6.0.19 php-composer -symfony/event-dispatcher-contracts v3.0.2 php-composer -symfony/finder v6.0.19 php-composer -symfony/http-foundation v6.0.20 php-composer -symfony/http-kernel v6.0.20 php-composer -symfony/mime v6.0.19 php-composer +symfony/console v6.4.7 php-composer +symfony/css-selector v6.4.7 php-composer +symfony/deprecation-contracts v3.5.0 php-composer +symfony/dom-crawler v6.4.7 php-composer +symfony/error-handler v6.4.7 php-composer +symfony/event-dispatcher v6.4.7 php-composer +symfony/event-dispatcher-contracts v3.5.0 php-composer +symfony/finder v6.4.7 php-composer +symfony/http-foundation v6.4.7 php-composer +symfony/http-kernel v6.4.7 php-composer +symfony/mime v6.4.7 php-composer symfony/polyfill-ctype v1.29.0 php-composer symfony/polyfill-intl-grapheme v1.29.0 php-composer symfony/polyfill-intl-idn v1.29.0 php-composer @@ -270,17 +270,17 @@ symfony/polyfill-intl-normalizer v1.29.0 php-composer symfony/polyfill-mbstring v1.29.0 php-composer symfony/polyfill-php72 v1.29.0 php-composer symfony/polyfill-php80 v1.29.0 php-composer -symfony/polyfill-php81 v1.29.0 php-composer +symfony/polyfill-php83 v1.29.0 php-composer symfony/polyfill-uuid v1.29.0 php-composer -symfony/process v6.0.19 php-composer -symfony/routing v6.0.19 php-composer -symfony/service-contracts v3.0.2 php-composer -symfony/string v6.0.19 php-composer -symfony/translation v6.0.19 php-composer -symfony/translation-contracts v3.0.2 php-composer -symfony/uid v6.0.19 php-composer -symfony/var-dumper v6.0.19 php-composer -theseer/tokenizer 1.2.2 php-composer +symfony/process v6.4.7 php-composer +symfony/routing v6.4.7 php-composer +symfony/service-contracts v3.5.0 php-composer +symfony/string v6.4.7 php-composer +symfony/translation v6.4.7 php-composer +symfony/translation-contracts v3.5.0 php-composer +symfony/uid v6.4.7 php-composer +symfony/var-dumper v6.4.7 php-composer +theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024a-r0 apk utmps-libs 0.1.2.2-r0 apk From 072e39ee0685d60dbba0771b26e6a6acf1e50161 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 13 May 2024 18:23:07 +0000 Subject: [PATCH 351/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d0efd47..01e90a4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -53,7 +53,7 @@ fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk git 2.43.0-r0 apk git-perl 2.43.0-r0 apk -glib 2.78.5-r0 apk +glib 2.78.6-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer guzzlehttp/promises 2.0.2 php-composer From e78d02587bd756b3f4b5af1bfe90224e86316317 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 May 2024 18:23:49 +0000 Subject: [PATCH 352/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 01e90a4..7b2c740 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -51,8 +51,8 @@ fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk -git 2.43.0-r0 apk -git-perl 2.43.0-r0 apk +git 2.43.4-r0 apk +git-perl 2.43.4-r0 apk glib 2.78.6-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer @@ -161,7 +161,7 @@ pcre 8.45-r3 apk pcre2 10.42-r2 apk perl 5.38.2-r0 apk perl-error 0.17029-r2 apk -perl-git 2.43.0-r0 apk +perl-git 2.43.4-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer From 08369835448ed8f6f1b028ecb711f17c74f31b3f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 10:49:09 +0000 Subject: [PATCH 353/452] Bot Updating Templated Files --- Jenkinsfile | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d95d26b..4aca22e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -305,7 +305,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -717,7 +717,7 @@ pipeline { --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ + -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ -e PORT=\"${CI_PORT}\" \ @@ -825,35 +825,13 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi - docker manifest push --purge ${MANIFESTIMAGE}:latest || : - docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 - fi - token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest") - if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest - fi - docker manifest push --purge ${MANIFESTIMAGE}:latest - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi done ''' From 9aeff1a1d06b0a01781d3f37e5bdad61e235615c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 10:50:51 +0000 Subject: [PATCH 354/452] Bot Updating Templated Files --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4aca22e..9967ae1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -535,6 +535,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -566,6 +567,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -594,6 +596,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { From 0c4f018f41c6124f6e4f92192c8be66b93fc0470 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 10:52:26 +0000 Subject: [PATCH 355/452] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acbcd31..f692151 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Find us at: # [linuxserver/bookstack](https://github.com/linuxserver/docker-bookstack) -[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbookstack?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fbookstack) +[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fbookstack?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack) [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-bookstack/releases) [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-bookstack/packages) From 51d49e40ba8bdd205bc8b062348a13b544e49e0a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Tue, 21 May 2024 10:55:30 +0000 Subject: [PATCH 356/452] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7b2c740..e354c70 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.5 php-composer -aws/aws-sdk-php 3.305.9 php-composer +aws/aws-sdk-php 3.307.1 php-composer bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.21-r0 apk brick/math 0.12.1 php-composer @@ -45,7 +45,7 @@ encodings 1.0.7-r1 apk fakerphp/faker v1.23.1 php-composer filp/whoops 2.15.4 php-composer findutils 4.9.0-r5 apk -firebase/php-jwt v6.10.0 php-composer +firebase/php-jwt v6.10.1 php-composer font-freefont 20120503-r4 apk fontconfig 2.14.2-r4 apk freetype 2.13.2-r0 apk @@ -63,15 +63,15 @@ hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.1-r0 apk icu-libs 74.1-r0 apk intervention/gif 4.1.0 php-composer -intervention/image 3.6.3 php-composer +intervention/image 3.6.4 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.5 php-composer +larastan/larastan v2.9.6 php-composer laravel/framework v10.48.10 php-composer laravel/prompts v0.1.21 php-composer laravel/serializable-closure v1.3.3 php-composer -laravel/socialite v5.13.2 php-composer +laravel/socialite v5.14.0 php-composer laravel/tinker v2.9.0 php-composer league/commonmark 2.4.2 php-composer league/config v1.2.0 php-composer @@ -135,7 +135,7 @@ mariadb-common 10.11.6-r0 apk masterminds/html5 2.9.0 php-composer memcached 1.6.22-r0 apk mkfontscale 1.2.2-r4 apk -mockery/mockery 1.6.11 php-composer +mockery/mockery 1.6.12 php-composer monolog/monolog 3.6.0 php-composer mtdowling/jmespath.php 2.7.0 php-composer musl 1.2.4_git20230717-r4 apk @@ -155,7 +155,7 @@ nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.1.4-r6 apk -paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk pcre2 10.42-r2 apk @@ -195,7 +195,7 @@ php83-zip 8.3.7-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.37 php-composer -phpstan/phpstan 1.10.67 php-composer +phpstan/phpstan 1.11.1 php-composer phpunit/php-code-coverage 10.1.14 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer @@ -211,7 +211,7 @@ psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer psr/http-client 1.0.3 php-composer -psr/http-factory 1.0.2 php-composer +psr/http-factory 1.1.0 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer @@ -247,7 +247,7 @@ socialiteproviders/manager v4.6.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.9.2 php-composer +squizlabs/php_codesniffer 3.10.0 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer From 0e6c35ab2dd8bb097ca79d14d7e7065c6d54de64 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 27 May 2024 18:23:23 +0000 Subject: [PATCH 357/452] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e354c70..02c4dd4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,8 +16,8 @@ bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.21-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r15 apk -busybox-binsh 1.36.1-r15 apk +busybox 1.36.1-r18 apk +busybox-binsh 1.36.1-r18 apk c-ares 1.27.0-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk @@ -89,7 +89,7 @@ libblkid 2.39.3-r0 apk libbsd 0.11.7-r3 apk libbz2 1.0.8-r6 apk libc-utils 0.7.2-r5 apk -libcrypto3 3.1.4-r6 apk +libcrypto3 3.1.5-r0 apk libcurl 8.5.0-r0 apk libdav1d 1.3.0-r1 apk libedit 20230828.3.1-r3 apk @@ -114,7 +114,7 @@ libsasl 2.1.28-r5 apk libseccomp 2.5.5-r0 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r3 apk -libssl3 3.1.4-r6 apk +libssl3 3.1.5-r0 apk libstdc++ 13.2.1_git20231014-r0 apk libunistring 1.1-r2 apk libuuid 2.39.3-r0 apk @@ -124,7 +124,7 @@ libxau 1.0.11-r3 apk libxcb 1.16-r0 apk libxdmcp 1.1.4-r3 apk libxext 1.3.5-r3 apk -libxml2 2.11.7-r0 apk +libxml2 2.11.8-r0 apk libxpm 3.5.17-r0 apk libxt 1.3.0-r4 apk libzip 1.10.1-r0 apk @@ -154,7 +154,7 @@ nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.4-r6 apk +openssl 3.1.5-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -251,7 +251,7 @@ squizlabs/php_codesniffer 3.10.0 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer -ssl_client 1.36.1-r15 apk +ssl_client 1.36.1-r18 apk symfony/console v6.4.7 php-composer symfony/css-selector v6.4.7 php-composer symfony/deprecation-contracts v3.5.0 php-composer From 40fdb1058e0f62d2d56d7646ccd76efdcb92c8cb Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Tue, 28 May 2024 20:01:03 +0100 Subject: [PATCH 358/452] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 3 +-- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 8 +++++--- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84e3782..2637378 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 # set version label ARG BUILD_DATE @@ -45,6 +45,7 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b67840a..6a3089f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -45,6 +45,7 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 9967ae1..680c56c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { CI_SSL = 'false' CI_DELAY = '30' CI_DOCKERENV='TEST_RUN=1' - CI_AUTH = 'user:password' + CI_AUTH = '' CI_WEBPATH = '' } stages { diff --git a/README.md b/README.md index f692151..86c36af 100644 --- a/README.md +++ b/README.md @@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.05.24:** - Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings. * **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **31.10.23:** - Further sanitize sed replace. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4a8571c..f893926 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'bookstackapp' @@ -26,5 +25,5 @@ repo_vars: - CI_SSL = 'false' - CI_DELAY = '30' - CI_DOCKERENV='TEST_RUN=1' - - CI_AUTH = 'user:password' + - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index 43b185b..e911fa5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "31.10.23:", desc: "Further sanitize sed replace." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 0644fbf..d8ef823 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,13 @@ -## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + http2 on; server_name _; From 1078bd4dfb72b235fc13b692d3bda46d0ec5845c Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Tue, 28 May 2024 20:11:12 +0100 Subject: [PATCH 359/452] Update http2 wording --- readme-vars.yml | 2 +- root/defaults/nginx/site-confs/default.conf.sample | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index e911fa5..1d8da8d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,7 +113,7 @@ app_setup_block: | # changelog changelogs: - - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings."} + - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "31.10.23:", desc: "Further sanitize sed replace." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index d8ef823..cfcbda2 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -7,8 +7,6 @@ server { listen 443 ssl default_server; listen [::]:443 ssl default_server; - http2 on; - server_name _; include /config/nginx/ssl.conf; From 223740182f128aa5ddcf0d4380d05a77619fccff Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Wed, 29 May 2024 13:58:02 +0100 Subject: [PATCH 360/452] Use wildcard listener --- root/defaults/nginx/site-confs/default.conf.sample | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index cfcbda2..dd6693b 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,8 @@ ## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { - listen 80 default_server; - listen [::]:80 default_server; - - listen 443 ssl default_server; - listen [::]:443 ssl default_server; + listen *:80 default_server; + listen *:443 ssl default_server; server_name _; From b1e2b2ee4f23619b3c856def4b060c05b06622b7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 29 May 2024 13:54:01 +0000 Subject: [PATCH 361/452] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 86c36af..b3c3bcf 100644 --- a/README.md +++ b/README.md @@ -337,7 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **27.05.24:** - Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings. +* **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **31.10.23:** - Further sanitize sed replace. From 69d9fd1452911a06134bcb159c9a9c760ae6b454 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 29 May 2024 13:56:47 +0000 Subject: [PATCH 362/452] Bot Updating Package Versions --- package_versions.txt | 162 ++++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 80 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 02c4dd4..6285ff5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,10 +1,10 @@ NAME VERSION TYPE Hidden Input 1, 0, 0, 0 dotnet -alpine-baselayout 3.4.3-r2 apk -alpine-baselayout-data 3.4.3-r2 apk +alpine-baselayout 3.6.5-r0 apk +alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.19.1-r0 apk -aom-libs 3.7.1-r0 apk +alpine-release 3.20.0-r0 apk +aom-libs 3.9.0-r0 apk apache2-utils 2.4.59-r0 apk apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk @@ -13,24 +13,24 @@ argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.5 php-composer aws/aws-sdk-php 3.307.1 php-composer bacon/bacon-qr-code 2.0.8 php-composer -bash 5.2.21-r0 apk +bash 5.2.26-r0 apk brick/math 0.12.1 php-composer -brotli-libs 1.1.0-r1 apk -busybox 1.36.1-r18 apk -busybox-binsh 1.36.1-r18 apk -c-ares 1.27.0-r0 apk +brotli-libs 1.1.0-r2 apk +busybox 1.36.1-r28 apk +busybox-binsh 1.36.1-r28 apk +c-ares 1.28.1-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk composer 2.7.6 binary -coreutils 9.4-r2 apk -coreutils-env 9.4-r2 apk -coreutils-fmt 9.4-r2 apk -coreutils-sha512sum 9.4-r2 apk -curl 8.5.0-r0 apk +coreutils 9.5-r1 apk +coreutils-env 9.5-r1 apk +coreutils-fmt 9.5-r1 apk +coreutils-sha512sum 9.5-r1 apk +curl 8.7.1-r0 apk dasprid/enum 1.0.5 php-composer -dbus-libs 1.14.10-r0 apk +dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.8.4 php-composer @@ -47,21 +47,22 @@ filp/whoops 2.15.4 php-composer findutils 4.9.0-r5 apk firebase/php-jwt v6.10.1 php-composer font-freefont 20120503-r4 apk -fontconfig 2.14.2-r4 apk +fontconfig 2.15.0-r1 apk freetype 2.13.2-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk -git 2.43.4-r0 apk -git-perl 2.43.4-r0 apk -glib 2.78.6-r0 apk +git 2.45.1-r0 apk +git-init-template 2.45.1-r0 apk +git-perl 2.45.1-r0 apk +glib 2.80.2-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer guzzlehttp/promises 2.0.2 php-composer guzzlehttp/psr7 2.6.2 php-composer guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer -icu-data-full 74.1-r0 apk -icu-libs 74.1-r0 apk +icu-data-full 74.2-r0 apk +icu-libs 74.2-r0 apk intervention/gif 4.1.0 php-composer intervention/image 3.6.4 php-composer itsgoingd/clockwork v5.2.2 php-composer @@ -82,86 +83,87 @@ league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.15.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer -libacl 2.3.1-r4 apk -libattr 2.5.1-r5 apk -libavif 1.0.3-r0 apk -libblkid 2.39.3-r0 apk -libbsd 0.11.7-r3 apk +libacl 2.3.2-r0 apk +libattr 2.5.2-r0 apk +libavif 1.0.4-r0 apk +libblkid 2.40.1-r1 apk +libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libc-utils 0.7.2-r5 apk -libcrypto3 3.1.5-r0 apk -libcurl 8.5.0-r0 apk -libdav1d 1.3.0-r1 apk -libedit 20230828.3.1-r3 apk +libcrypto3 3.3.0-r2 apk +libcurl 8.7.1-r0 apk +libdav1d 1.4.2-r0 apk +libeconf 0.6.3-r0 apk +libedit 20240517.3.1-r0 apk libevent 2.1.12-r7 apk libexpat 2.6.2-r0 apk -libffi 3.4.4-r3 apk -libfontenc 1.1.7-r4 apk -libgcc 13.2.1_git20231014-r0 apk -libice 1.1.1-r5 apk -libidn2 2.3.4-r4 apk -libintl 0.22.3-r0 apk -libjpeg-turbo 3.0.1-r0 apk -libldap 2.6.6-r1 apk +libffi 3.4.6-r0 apk +libfontenc 1.1.8-r0 apk +libgcc 13.2.1_git20240309-r0 apk +libice 1.1.1-r6 apk +libidn2 2.3.7-r0 apk +libintl 0.22.5-r0 apk +libjpeg-turbo 3.0.3-r0 apk +libldap 2.6.7-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.39.3-r0 apk -libncursesw 6.4_p20231125-r0 apk -libpcre2-16 10.42-r2 apk -libpng 1.6.40-r0 apk +libmount 2.40.1-r1 apk +libncursesw 6.4_p20240420-r0 apk +libpcre2-16 10.43-r0 apk +libpng 1.6.43-r0 apk libproc2 4.0.4-r0 apk -libsasl 2.1.28-r5 apk -libseccomp 2.5.5-r0 apk +libpsl 0.21.5-r1 apk +libsasl 2.1.28-r6 apk +libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk -libsm 1.2.4-r3 apk -libssl3 3.1.5-r0 apk -libstdc++ 13.2.1_git20231014-r0 apk -libunistring 1.1-r2 apk -libuuid 2.39.3-r0 apk +libsm 1.2.4-r4 apk +libssl3 3.3.0-r2 apk +libstdc++ 13.2.1_git20240309-r0 apk +libunistring 1.2-r0 apk +libuuid 2.40.1-r1 apk libwebp 1.3.2-r0 apk -libx11 1.8.7-r0 apk -libxau 1.0.11-r3 apk -libxcb 1.16-r0 apk -libxdmcp 1.1.4-r3 apk -libxext 1.3.5-r3 apk -libxml2 2.11.8-r0 apk +libx11 1.8.9-r1 apk +libxau 1.0.11-r4 apk +libxcb 1.16.1-r0 apk +libxdmcp 1.1.5-r1 apk +libxext 1.3.6-r2 apk +libxml2 2.12.7-r0 apk libxpm 3.5.17-r0 apk -libxt 1.3.0-r4 apk +libxt 1.3.0-r5 apk libzip 1.10.1-r0 apk -linux-pam 1.5.3-r7 apk +linux-pam 1.6.0-r0 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.6-r0 apk -mariadb-common 10.11.6-r0 apk +mariadb-client 10.11.8-r0 apk +mariadb-common 10.11.8-r0 apk masterminds/html5 2.9.0 php-composer -memcached 1.6.22-r0 apk -mkfontscale 1.2.2-r4 apk +memcached 1.6.27-r0 apk +mkfontscale 1.2.2-r6 apk mockery/mockery 1.6.12 php-composer monolog/monolog 3.6.0 php-composer mtdowling/jmespath.php 2.7.0 php-composer -musl 1.2.4_git20230717-r4 apk -musl-utils 1.2.4_git20230717-r4 apk +musl 1.2.5-r0 apk +musl-utils 1.2.5-r0 apk myclabs/deep-copy 1.11.1 php-composer -nano 7.2-r1 apk -ncurses-terminfo-base 6.4_p20231125-r0 apk +nano 8.0-r0 apk +ncurses-terminfo-base 6.4_p20240420-r0 apk nesbot/carbon 2.72.3 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer -nghttp2-libs 1.58.0-r0 apk -nginx 1.24.0-r16 apk +nghttp2-libs 1.62.0-r0 apk +nginx 1.26.0-r2 apk nikic/php-parser v5.0.2 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.1.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.1.5-r0 apk +openssl 3.3.0-r2 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk -pcre2 10.42-r2 apk +pcre2 10.43-r0 apk perl 5.38.2-r0 apk perl-error 0.17029-r2 apk -perl-git 2.43.4-r0 apk +perl-git 2.45.1-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer @@ -220,7 +222,7 @@ qt5-qtbase 5.15.10_git20230714-r2 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.0.0 php-composer ramsey/uuid 4.7.6 php-composer -readline 8.2.1-r2 apk +readline 8.2.10-r0 apk robrichards/xmlseclibs 3.1.1 php-composer sabberworm/php-css-parser v8.5.1 php-composer scanelf 1.3.7-r2 apk @@ -239,8 +241,8 @@ sebastian/object-reflector 3.0.0 php-composer sebastian/recursion-context 5.0.0 php-composer sebastian/type 4.0.0 php-composer sebastian/version 4.0.1 php-composer -shadow 4.14.2-r0 apk -skalibs 2.14.0.1-r0 apk +shadow 4.15.1-r0 apk +skalibs 2.14.1.1-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.6.0 php-composer @@ -251,7 +253,7 @@ squizlabs/php_codesniffer 3.10.0 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer -ssl_client 1.36.1-r18 apk +ssl_client 1.36.1-r28 apk symfony/console v6.4.7 php-composer symfony/css-selector v6.4.7 php-composer symfony/deprecation-contracts v3.5.0 php-composer @@ -282,11 +284,11 @@ symfony/uid v6.4.7 php-composer symfony/var-dumper v6.4.7 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2024a-r0 apk -utmps-libs 0.1.2.2-r0 apk +tzdata 2024a-r1 apk +utmps-libs 0.1.2.2-r1 apk vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer -xz-libs 5.4.5-r0 apk -zlib 1.3.1-r0 apk -zstd-libs 1.5.5-r8 apk +xz-libs 5.6.1-r3 apk +zlib 1.3.1-r1 apk +zstd-libs 1.5.6-r0 apk From 8f7e4da27766887303c9ee4e9ac037dcc8873720 Mon Sep 17 00:00:00 2001 From: thespad <git@spad.co.uk> Date: Sat, 1 Jun 2024 17:48:04 +0100 Subject: [PATCH 363/452] Tidy readme --- README.md | 11 ++++++----- readme-vars.yml | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index b3c3bcf..6acd665 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Powered by SQL and including a Markdown editor for those who prefer it, BookStac For more information on BookStack visit their website and check it out: https://www.bookstackapp.com -[![bookstack](https://s3-us-west-2.amazonaws.com/linuxserver-docs/images/bookstack-logo500x500.png)](https://github.com/BookStackApp/BookStack) +[![bookstack](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png)](https://github.com/BookStackApp/BookStack) ## Supported Architectures @@ -99,7 +99,6 @@ To help you get started creating a container from this image you can either use ```yaml --- -version: "2" services: bookstack: image: lscr.io/linuxserver/bookstack @@ -107,6 +106,7 @@ services: environment: - PUID=1000 - PGID=1000 + - TZ=Europe/London - APP_URL=https://bookstack.example.com - DB_HOST=bookstack_db - DB_PORT=3306 @@ -114,25 +114,26 @@ services: - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp volumes: - - ./bookstack_app_data:/config + - /path/to/bookstack_app_data:/config ports: - 6875:80 restart: unless-stopped depends_on: - bookstack_db + bookstack_db: image: lscr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 - PGID=1000 - - MYSQL_ROOT_PASSWORD=<yourdbpass> - TZ=Europe/London + - MYSQL_ROOT_PASSWORD=<yourdbpass> - MYSQL_DATABASE=bookstackapp - MYSQL_USER=bookstack - MYSQL_PASSWORD=<yourdbpass> volumes: - - ./bookstack_db_data:/config + - /path/to/bookstack_db_data:/config restart: unless-stopped ``` diff --git a/readme-vars.yml b/readme-vars.yml index 1d8da8d..d6f8a7f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -3,7 +3,7 @@ # project information project_name: bookstack project_url: "https://github.com/BookStackApp/BookStack" -project_logo: "https://s3-us-west-2.amazonaws.com/linuxserver-docs/images/bookstack-logo500x500.png" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png" project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. @@ -24,7 +24,6 @@ param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_env: true param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} - { env_var: "APP_URL", env_value: "yourbaseurl", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "yourdbhost", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "yourdbport", desc: "for specifying the database port if not default 3306" } @@ -42,7 +41,6 @@ opt_param_env_vars: custom_compose: | --- - version: "2" services: bookstack: image: lscr.io/linuxserver/bookstack @@ -50,6 +48,7 @@ custom_compose: | environment: - PUID=1000 - PGID=1000 + - TZ=Europe/London - APP_URL=https://bookstack.example.com - DB_HOST=bookstack_db - DB_PORT=3306 @@ -57,25 +56,26 @@ custom_compose: | - DB_PASS=<yourdbpass> - DB_DATABASE=bookstackapp volumes: - - ./bookstack_app_data:/config + - /path/to/bookstack_app_data:/config ports: - 6875:80 restart: unless-stopped depends_on: - bookstack_db + bookstack_db: image: lscr.io/linuxserver/mariadb container_name: bookstack_db environment: - PUID=1000 - PGID=1000 - - MYSQL_ROOT_PASSWORD=<yourdbpass> - TZ=Europe/London + - MYSQL_ROOT_PASSWORD=<yourdbpass> - MYSQL_DATABASE=bookstackapp - MYSQL_USER=bookstack - MYSQL_PASSWORD=<yourdbpass> volumes: - - ./bookstack_db_data:/config + - /path/to/bookstack_db_data:/config restart: unless-stopped # application setup block From 721ace2bca354a8f9013323d9a119a464d09cede Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 1 Jun 2024 20:34:56 +0000 Subject: [PATCH 364/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6285ff5..cb983bc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -150,7 +150,7 @@ netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.62.0-r0 apk -nginx 1.26.0-r2 apk +nginx 1.26.1-r0 apk nikic/php-parser v5.0.2 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer From 9458f760cae7b41d49595e1f3f242daf962c2a25 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Jun 2024 11:28:59 +0000 Subject: [PATCH 365/452] Bot Updating Package Versions --- package_versions.txt | 112 +++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cb983bc..d95c0d8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.5 php-composer -aws/aws-sdk-php 3.307.1 php-composer +aws/aws-sdk-php 3.311.2 php-composer bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer @@ -35,7 +35,7 @@ dflydev/dot-access-data v3.0.2 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.8.4 php-composer doctrine/deprecations 1.1.3 php-composer -doctrine/event-manager 2.0.0 php-composer +doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer dompdf/dompdf v2.0.8 php-composer @@ -51,9 +51,9 @@ fontconfig 2.15.0-r1 apk freetype 2.13.2-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.23-r1 apk -git 2.45.1-r0 apk -git-init-template 2.45.1-r0 apk -git-perl 2.45.1-r0 apk +git 2.45.2-r0 apk +git-init-template 2.45.2-r0 apk +git-perl 2.45.2-r0 apk glib 2.80.2-r0 apk graham-campbell/result-type v1.1.2 php-composer guzzlehttp/guzzle 7.8.1 php-composer @@ -64,21 +64,21 @@ hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.1.0 php-composer -intervention/image 3.6.4 php-composer +intervention/image 3.6.5 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.6 php-composer -laravel/framework v10.48.10 php-composer -laravel/prompts v0.1.21 php-composer +larastan/larastan v2.9.7 php-composer +laravel/framework v10.48.12 php-composer +laravel/prompts v0.1.23 php-composer laravel/serializable-closure v1.3.3 php-composer laravel/socialite v5.14.0 php-composer laravel/tinker v2.9.0 php-composer league/commonmark 2.4.2 php-composer league/config v1.2.0 php-composer -league/flysystem 3.27.0 php-composer -league/flysystem-aws-s3-v3 3.27.0 php-composer -league/flysystem-local 3.25.1 php-composer +league/flysystem 3.28.0 php-composer +league/flysystem-aws-s3-v3 3.28.0 php-composer +league/flysystem-local 3.28.0 php-composer league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.15.0 php-composer league/oauth1-client v1.10.1 php-composer @@ -145,7 +145,7 @@ musl-utils 1.2.5-r0 apk myclabs/deep-copy 1.11.1 php-composer nano 8.0-r0 apk ncurses-terminfo-base 6.4_p20240420-r0 apk -nesbot/carbon 2.72.3 php-composer +nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer @@ -154,7 +154,7 @@ nginx 1.26.1-r0 apk nikic/php-parser v5.0.2 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer -onelogin/php-saml 4.1.0 php-composer +onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.0-r2 apk paragonie/constant_time_encoding v2.7.0 php-composer @@ -163,41 +163,41 @@ pcre 8.45-r3 apk pcre2 10.43-r0 apk perl 5.38.2-r0 apk perl-error 0.17029-r2 apk -perl-git 2.45.1-r0 apk +perl-git 2.45.2-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.4 php-composer -php83 8.3.7-r0 apk -php83-common 8.3.7-r0 apk -php83-ctype 8.3.7-r0 apk -php83-curl 8.3.7-r0 apk -php83-dom 8.3.7-r0 apk -php83-fileinfo 8.3.7-r0 apk -php83-fpm 8.3.7-r0 apk -php83-gd 8.3.7-r0 apk -php83-iconv 8.3.7-r0 apk -php83-ldap 8.3.7-r0 apk -php83-mbstring 8.3.7-r0 apk -php83-mysqlnd 8.3.7-r0 apk -php83-openssl 8.3.7-r0 apk -php83-pdo 8.3.7-r0 apk -php83-pdo_mysql 8.3.7-r0 apk +php83 8.3.8-r0 apk +php83-common 8.3.8-r0 apk +php83-ctype 8.3.8-r0 apk +php83-curl 8.3.8-r0 apk +php83-dom 8.3.8-r0 apk +php83-fileinfo 8.3.8-r0 apk +php83-fpm 8.3.8-r0 apk +php83-gd 8.3.8-r0 apk +php83-iconv 8.3.8-r0 apk +php83-ldap 8.3.8-r0 apk +php83-mbstring 8.3.8-r0 apk +php83-mysqlnd 8.3.8-r0 apk +php83-openssl 8.3.8-r0 apk +php83-pdo 8.3.8-r0 apk +php83-pdo_mysql 8.3.8-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk -php83-pecl-msgpack 2.2.0-r1 apk -php83-phar 8.3.7-r0 apk -php83-session 8.3.7-r0 apk -php83-simplexml 8.3.7-r0 apk -php83-sockets 8.3.7-r0 apk -php83-tokenizer 8.3.7-r0 apk -php83-xml 8.3.7-r0 apk -php83-xmlwriter 8.3.7-r0 apk -php83-zip 8.3.7-r0 apk +php83-pecl-msgpack 2.2.0-r2 apk +php83-phar 8.3.8-r0 apk +php83-session 8.3.8-r0 apk +php83-simplexml 8.3.8-r0 apk +php83-sockets 8.3.8-r0 apk +php83-tokenizer 8.3.8-r0 apk +php83-xml 8.3.8-r0 apk +php83-xmlwriter 8.3.8-r0 apk +php83-zip 8.3.8-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.37 php-composer -phpstan/phpstan 1.11.1 php-composer +phpstan/phpstan 1.11.4 php-composer phpunit/php-code-coverage 10.1.14 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer @@ -249,22 +249,22 @@ socialiteproviders/manager v4.6.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.10.0 php-composer +squizlabs/php_codesniffer 3.10.1 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r28 apk -symfony/console v6.4.7 php-composer -symfony/css-selector v6.4.7 php-composer +symfony/console v6.4.8 php-composer +symfony/css-selector v6.4.8 php-composer symfony/deprecation-contracts v3.5.0 php-composer -symfony/dom-crawler v6.4.7 php-composer -symfony/error-handler v6.4.7 php-composer -symfony/event-dispatcher v6.4.7 php-composer +symfony/dom-crawler v6.4.8 php-composer +symfony/error-handler v6.4.8 php-composer +symfony/event-dispatcher v6.4.8 php-composer symfony/event-dispatcher-contracts v3.5.0 php-composer -symfony/finder v6.4.7 php-composer -symfony/http-foundation v6.4.7 php-composer -symfony/http-kernel v6.4.7 php-composer -symfony/mime v6.4.7 php-composer +symfony/finder v6.4.8 php-composer +symfony/http-foundation v6.4.8 php-composer +symfony/http-kernel v6.4.8 php-composer +symfony/mime v6.4.8 php-composer symfony/polyfill-ctype v1.29.0 php-composer symfony/polyfill-intl-grapheme v1.29.0 php-composer symfony/polyfill-intl-idn v1.29.0 php-composer @@ -274,14 +274,14 @@ symfony/polyfill-php72 v1.29.0 php-composer symfony/polyfill-php80 v1.29.0 php-composer symfony/polyfill-php83 v1.29.0 php-composer symfony/polyfill-uuid v1.29.0 php-composer -symfony/process v6.4.7 php-composer -symfony/routing v6.4.7 php-composer +symfony/process v6.4.8 php-composer +symfony/routing v6.4.8 php-composer symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.7 php-composer -symfony/translation v6.4.7 php-composer +symfony/string v6.4.8 php-composer +symfony/translation v6.4.8 php-composer symfony/translation-contracts v3.5.0 php-composer -symfony/uid v6.4.7 php-composer -symfony/var-dumper v6.4.7 php-composer +symfony/uid v6.4.8 php-composer +symfony/var-dumper v6.4.8 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024a-r1 apk From 82e27df9721a1f94fb4400d4a53634547fafd13c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Jun 2024 18:25:01 +0000 Subject: [PATCH 366/452] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d95c0d8..d31522f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,14 +16,14 @@ bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.36.1-r28 apk -busybox-binsh 1.36.1-r28 apk +busybox 1.36.1-r29 apk +busybox-binsh 1.36.1-r29 apk c-ares 1.28.1-r0 apk ca-certificates 20240226-r0 apk ca-certificates-bundle 20240226-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.7.6 binary +composer 2.7.7 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk @@ -89,7 +89,7 @@ libavif 1.0.4-r0 apk libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.0-r2 apk +libcrypto3 3.3.1-r0 apk libcurl 8.7.1-r0 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk @@ -116,7 +116,7 @@ libsasl 2.1.28-r6 apk libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.0-r2 apk +libssl3 3.3.1-r0 apk libstdc++ 13.2.1_git20240309-r0 apk libunistring 1.2-r0 apk libuuid 2.40.1-r1 apk @@ -156,7 +156,7 @@ nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.0-r2 apk +openssl 3.3.1-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -253,7 +253,7 @@ squizlabs/php_codesniffer 3.10.1 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer -ssl_client 1.36.1-r28 apk +ssl_client 1.36.1-r29 apk symfony/console v6.4.8 php-composer symfony/css-selector v6.4.8 php-composer symfony/deprecation-contracts v3.5.0 php-composer From 83ce5bd30b38ad5f527e4b0db2ffbe049c1170f1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 1 Jul 2024 18:27:15 +0000 Subject: [PATCH 367/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d31522f..279fbfc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Hidden Input 1, 0, 0, 0 dotnet alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.0-r0 apk +alpine-release 3.20.1-r0 apk aom-libs 3.9.0-r0 apk apache2-utils 2.4.59-r0 apk apk-tools 2.14.4-r0 apk From c4732bf86a80046b927d1bffe13d983ba4c29ad6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 8 Jul 2024 18:26:18 +0000 Subject: [PATCH 368/452] Bot Updating Package Versions --- package_versions.txt | 60 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 279fbfc..ea8c843 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk alpine-release 3.20.1-r0 apk aom-libs 3.9.0-r0 apk -apache2-utils 2.4.59-r0 apk +apache2-utils 2.4.61-r0 apk apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk @@ -28,7 +28,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.7.1-r0 apk +curl 8.8.0-r0 apk dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.2 php-composer @@ -89,8 +89,8 @@ libavif 1.0.4-r0 apk libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r0 apk -libcurl 8.7.1-r0 apk +libcrypto3 3.3.1-r1 apk +libcurl 8.8.0-r0 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk @@ -116,7 +116,7 @@ libsasl 2.1.28-r6 apk libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.1-r0 apk +libssl3 3.3.1-r1 apk libstdc++ 13.2.1_git20240309-r0 apk libunistring 1.2-r0 apk libuuid 2.40.1-r1 apk @@ -149,14 +149,14 @@ nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer -nghttp2-libs 1.62.0-r0 apk +nghttp2-libs 1.62.1-r0 apk nginx 1.26.1-r0 apk nikic/php-parser v5.0.2 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.1-r0 apk +openssl 3.3.1-r1 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -168,32 +168,32 @@ phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.4 php-composer -php83 8.3.8-r0 apk -php83-common 8.3.8-r0 apk -php83-ctype 8.3.8-r0 apk -php83-curl 8.3.8-r0 apk -php83-dom 8.3.8-r0 apk -php83-fileinfo 8.3.8-r0 apk -php83-fpm 8.3.8-r0 apk -php83-gd 8.3.8-r0 apk -php83-iconv 8.3.8-r0 apk -php83-ldap 8.3.8-r0 apk -php83-mbstring 8.3.8-r0 apk -php83-mysqlnd 8.3.8-r0 apk -php83-openssl 8.3.8-r0 apk -php83-pdo 8.3.8-r0 apk -php83-pdo_mysql 8.3.8-r0 apk +php83 8.3.9-r0 apk +php83-common 8.3.9-r0 apk +php83-ctype 8.3.9-r0 apk +php83-curl 8.3.9-r0 apk +php83-dom 8.3.9-r0 apk +php83-fileinfo 8.3.9-r0 apk +php83-fpm 8.3.9-r0 apk +php83-gd 8.3.9-r0 apk +php83-iconv 8.3.9-r0 apk +php83-ldap 8.3.9-r0 apk +php83-mbstring 8.3.9-r0 apk +php83-mysqlnd 8.3.9-r0 apk +php83-openssl 8.3.9-r0 apk +php83-pdo 8.3.9-r0 apk +php83-pdo_mysql 8.3.9-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.8-r0 apk -php83-session 8.3.8-r0 apk -php83-simplexml 8.3.8-r0 apk -php83-sockets 8.3.8-r0 apk -php83-tokenizer 8.3.8-r0 apk -php83-xml 8.3.8-r0 apk -php83-xmlwriter 8.3.8-r0 apk -php83-zip 8.3.8-r0 apk +php83-phar 8.3.9-r0 apk +php83-session 8.3.9-r0 apk +php83-simplexml 8.3.9-r0 apk +php83-sockets 8.3.9-r0 apk +php83-tokenizer 8.3.9-r0 apk +php83-xml 8.3.9-r0 apk +php83-xmlwriter 8.3.9-r0 apk +php83-zip 8.3.9-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.37 php-composer From 76bc27286e78031ee3d8dfc4013e1a15f119aa50 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 14 Jul 2024 16:49:26 +0000 Subject: [PATCH 369/452] Bot Updating Templated Files --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 680c56c..2bb05cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,7 +255,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -362,7 +362,7 @@ pipeline { fi echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ cd ${TEMPDIR}/docs/docker-documentation @@ -380,8 +380,8 @@ pipeline { echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then @@ -713,7 +713,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -804,7 +804,7 @@ pipeline { echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do From ac8cb7a7960eb85086c9f3abd66b7d66e9070a61 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 14 Jul 2024 16:51:04 +0000 Subject: [PATCH 370/452] Bot Updating Templated Files --- .github/workflows/permissions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc5..02e1bdb 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -5,6 +5,8 @@ on: - '**/run' - '**/finish' - '**/check' + - 'root/migrations/*' + jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From f7b4f2442e6874945c7c6e4cea76613ea5821385 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 14 Jul 2024 16:54:28 +0000 Subject: [PATCH 371/452] Bot Updating Package Versions --- package_versions.txt | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ea8c843..c698757 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,8 +10,8 @@ apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk -aws/aws-crt-php v1.2.5 php-composer -aws/aws-sdk-php 3.311.2 php-composer +aws/aws-crt-php v1.2.6 php-composer +aws/aws-sdk-php 3.316.3 php-composer bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer @@ -31,9 +31,9 @@ coreutils-sha512sum 9.5-r1 apk curl 8.8.0-r0 apk dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r1 apk -dflydev/dot-access-data v3.0.2 php-composer +dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.8.4 php-composer +doctrine/dbal 3.8.6 php-composer doctrine/deprecations 1.1.3 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer @@ -64,15 +64,15 @@ hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.1.0 php-composer -intervention/image 3.6.5 php-composer +intervention/image 3.7.2 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.7 php-composer -laravel/framework v10.48.12 php-composer -laravel/prompts v0.1.23 php-composer +larastan/larastan v2.9.8 php-composer +laravel/framework v10.48.16 php-composer +laravel/prompts v0.1.24 php-composer laravel/serializable-closure v1.3.3 php-composer -laravel/socialite v5.14.0 php-composer +laravel/socialite v5.15.1 php-composer laravel/tinker v2.9.0 php-composer league/commonmark 2.4.2 php-composer league/config v1.2.0 php-composer @@ -89,7 +89,7 @@ libavif 1.0.4-r0 apk libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r1 apk +libcrypto3 3.3.1-r3 apk libcurl 8.8.0-r0 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk @@ -116,7 +116,7 @@ libsasl 2.1.28-r6 apk libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.1-r1 apk +libssl3 3.3.1-r3 apk libstdc++ 13.2.1_git20240309-r0 apk libunistring 1.2-r0 apk libuuid 2.40.1-r1 apk @@ -138,11 +138,11 @@ masterminds/html5 2.9.0 php-composer memcached 1.6.27-r0 apk mkfontscale 1.2.2-r6 apk mockery/mockery 1.6.12 php-composer -monolog/monolog 3.6.0 php-composer +monolog/monolog 3.7.0 php-composer mtdowling/jmespath.php 2.7.0 php-composer musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk -myclabs/deep-copy 1.11.1 php-composer +myclabs/deep-copy 1.12.0 php-composer nano 8.0-r0 apk ncurses-terminfo-base 6.4_p20240420-r0 apk nesbot/carbon 2.72.5 php-composer @@ -151,12 +151,12 @@ nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.62.1-r0 apk nginx 1.26.1-r0 apk -nikic/php-parser v5.0.2 php-composer +nikic/php-parser v5.1.0 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.1-r1 apk +openssl 3.3.1-r3 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -196,14 +196,14 @@ php83-xmlwriter 8.3.9-r0 apk php83-zip 8.3.9-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.37 php-composer -phpstan/phpstan 1.11.4 php-composer -phpunit/php-code-coverage 10.1.14 php-composer +phpseclib/phpseclib 3.0.39 php-composer +phpstan/phpstan 1.11.7 php-composer +phpunit/php-code-coverage 10.1.15 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.20 php-composer +phpunit/phpunit 10.5.27 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -217,14 +217,14 @@ psr/http-factory 1.1.0 php-composer psr/http-message 2.0 php-composer psr/log 3.0.0 php-composer psr/simple-cache 3.0.0 php-composer -psy/psysh v0.12.3 php-composer +psy/psysh v0.12.4 php-composer qt5-qtbase 5.15.10_git20230714-r2 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.0.0 php-composer ramsey/uuid 4.7.6 php-composer readline 8.2.10-r0 apk robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser v8.5.1 php-composer +sabberworm/php-css-parser v8.6.0 php-composer scanelf 1.3.7-r2 apk sebastian/cli-parser 2.0.1 php-composer sebastian/code-unit 2.0.0 php-composer @@ -254,34 +254,34 @@ ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r29 apk -symfony/console v6.4.8 php-composer +symfony/console v6.4.9 php-composer symfony/css-selector v6.4.8 php-composer symfony/deprecation-contracts v3.5.0 php-composer symfony/dom-crawler v6.4.8 php-composer -symfony/error-handler v6.4.8 php-composer +symfony/error-handler v6.4.9 php-composer symfony/event-dispatcher v6.4.8 php-composer symfony/event-dispatcher-contracts v3.5.0 php-composer symfony/finder v6.4.8 php-composer symfony/http-foundation v6.4.8 php-composer -symfony/http-kernel v6.4.8 php-composer -symfony/mime v6.4.8 php-composer -symfony/polyfill-ctype v1.29.0 php-composer -symfony/polyfill-intl-grapheme v1.29.0 php-composer -symfony/polyfill-intl-idn v1.29.0 php-composer -symfony/polyfill-intl-normalizer v1.29.0 php-composer -symfony/polyfill-mbstring v1.29.0 php-composer -symfony/polyfill-php72 v1.29.0 php-composer -symfony/polyfill-php80 v1.29.0 php-composer -symfony/polyfill-php83 v1.29.0 php-composer -symfony/polyfill-uuid v1.29.0 php-composer +symfony/http-kernel v6.4.9 php-composer +symfony/mime v6.4.9 php-composer +symfony/polyfill-ctype v1.30.0 php-composer +symfony/polyfill-intl-grapheme v1.30.0 php-composer +symfony/polyfill-intl-idn v1.30.0 php-composer +symfony/polyfill-intl-normalizer v1.30.0 php-composer +symfony/polyfill-mbstring v1.30.0 php-composer +symfony/polyfill-php72 v1.30.0 php-composer +symfony/polyfill-php80 v1.30.0 php-composer +symfony/polyfill-php83 v1.30.0 php-composer +symfony/polyfill-uuid v1.30.0 php-composer symfony/process v6.4.8 php-composer symfony/routing v6.4.8 php-composer symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.8 php-composer +symfony/string v6.4.9 php-composer symfony/translation v6.4.8 php-composer symfony/translation-contracts v3.5.0 php-composer symfony/uid v6.4.8 php-composer -symfony/var-dumper v6.4.8 php-composer +symfony/var-dumper v6.4.9 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024a-r1 apk From 1c26d282918327e2cf3c888ce829b181dcfb666c Mon Sep 17 00:00:00 2001 From: Eric Nemchik <eric@nemchik.com> Date: Tue, 16 Jul 2024 20:44:27 -0500 Subject: [PATCH 372/452] Delete root/defaults/nginx/site-confs/default.conf.sample redundant to base --- .../nginx/site-confs/default.conf.sample | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 root/defaults/nginx/site-confs/default.conf.sample diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample deleted file mode 100644 index dd6693b..0000000 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ /dev/null @@ -1,38 +0,0 @@ -## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample - -server { - listen *:80 default_server; - listen *:443 ssl default_server; - - server_name _; - - include /config/nginx/ssl.conf; - - root /app/www/public; - index index.html index.htm index.php; - - location / { - # enable for basic auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args; - } - - location ~ ^(.+\.php)(.*)$ { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - fastcgi_split_path_info ^(.+\.php)(.*)$; - if (!-f $document_root$fastcgi_script_name) { return 404; } - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - - # deny access to .htaccess/.htpasswd files - location ~ /\.ht { - deny all; - } -} From c17a8d6dbd9ca787eef0a12b6352be2c9e951cbf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 19 Jul 2024 21:37:25 +0000 Subject: [PATCH 373/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c698757..50f1e58 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -19,8 +19,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.36.1-r29 apk busybox-binsh 1.36.1-r29 apk c-ares 1.28.1-r0 apk -ca-certificates 20240226-r0 apk -ca-certificates-bundle 20240226-r0 apk +ca-certificates 20240705-r0 apk +ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk composer 2.7.7 binary From 25f8bddc4e1c13f2239327b5a5c23300abfeb5c8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 29 Jul 2024 18:27:13 +0000 Subject: [PATCH 374/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 50f1e58..b2d788f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk alpine-release 3.20.1-r0 apk aom-libs 3.9.0-r0 apk -apache2-utils 2.4.61-r0 apk +apache2-utils 2.4.62-r0 apk apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk From c6b23e665fff8b23a7d0ffd631ea5695b9f57d5c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 Aug 2024 18:26:40 +0000 Subject: [PATCH 375/452] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b2d788f..f7bc6ae 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,8 +3,8 @@ Hidden Input 1, 0, 0, 0 dotnet alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.1-r0 apk -aom-libs 3.9.0-r0 apk +alpine-release 3.20.2-r0 apk +aom-libs 3.9.1-r0 apk apache2-utils 2.4.62-r0 apk apk-tools 2.14.4-r0 apk apr 1.7.4-r0 apk @@ -28,7 +28,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.8.0-r0 apk +curl 8.9.0-r0 apk dasprid/enum 1.0.5 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer @@ -90,7 +90,7 @@ libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.1-r3 apk -libcurl 8.8.0-r0 apk +libcurl 8.9.0-r0 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk @@ -168,32 +168,32 @@ phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.4 php-composer -php83 8.3.9-r0 apk -php83-common 8.3.9-r0 apk -php83-ctype 8.3.9-r0 apk -php83-curl 8.3.9-r0 apk -php83-dom 8.3.9-r0 apk -php83-fileinfo 8.3.9-r0 apk -php83-fpm 8.3.9-r0 apk -php83-gd 8.3.9-r0 apk -php83-iconv 8.3.9-r0 apk -php83-ldap 8.3.9-r0 apk -php83-mbstring 8.3.9-r0 apk -php83-mysqlnd 8.3.9-r0 apk -php83-openssl 8.3.9-r0 apk -php83-pdo 8.3.9-r0 apk -php83-pdo_mysql 8.3.9-r0 apk +php83 8.3.10-r0 apk +php83-common 8.3.10-r0 apk +php83-ctype 8.3.10-r0 apk +php83-curl 8.3.10-r0 apk +php83-dom 8.3.10-r0 apk +php83-fileinfo 8.3.10-r0 apk +php83-fpm 8.3.10-r0 apk +php83-gd 8.3.10-r0 apk +php83-iconv 8.3.10-r0 apk +php83-ldap 8.3.10-r0 apk +php83-mbstring 8.3.10-r0 apk +php83-mysqlnd 8.3.10-r0 apk +php83-openssl 8.3.10-r0 apk +php83-pdo 8.3.10-r0 apk +php83-pdo_mysql 8.3.10-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.9-r0 apk -php83-session 8.3.9-r0 apk -php83-simplexml 8.3.9-r0 apk -php83-sockets 8.3.9-r0 apk -php83-tokenizer 8.3.9-r0 apk -php83-xml 8.3.9-r0 apk -php83-xmlwriter 8.3.9-r0 apk -php83-zip 8.3.9-r0 apk +php83-phar 8.3.10-r0 apk +php83-session 8.3.10-r0 apk +php83-simplexml 8.3.10-r0 apk +php83-sockets 8.3.10-r0 apk +php83-tokenizer 8.3.10-r0 apk +php83-xml 8.3.10-r0 apk +php83-xmlwriter 8.3.10-r0 apk +php83-zip 8.3.10-r0 apk phpmyadmin/sql-parser 5.9.0 php-composer phpoption/phpoption 1.9.2 php-composer phpseclib/phpseclib 3.0.39 php-composer From c8ffa209f1b910257627993d0954800a38eaecf0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 12 Aug 2024 18:27:12 +0000 Subject: [PATCH 376/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index f7bc6ae..4b953ad 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -289,6 +289,6 @@ utmps-libs 0.1.2.2-r1 apk vlucas/phpdotenv v5.6.0 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer -xz-libs 5.6.1-r3 apk +xz-libs 5.6.2-r0 apk zlib 1.3.1-r1 apk zstd-libs 1.5.6-r0 apk From 8b6b85d1a31c125233dee5d6444915db9eae781e Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 13 Aug 2024 15:15:45 +0100 Subject: [PATCH 377/452] Make migrations executable --- root/migrations/02-default-location | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/migrations/02-default-location diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location old mode 100644 new mode 100755 From 80de27102c971e71c0e222c90518eac55775ea42 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Aug 2024 18:24:50 +0000 Subject: [PATCH 378/452] Bot Updating Templated Files --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2bb05cf..40292e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,8 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') + QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') + GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') EXT_GIT_BRANCH = 'master' EXT_USER = 'bookstackapp' EXT_REPO = 'bookstack' @@ -39,9 +41,23 @@ pipeline { CI_WEBPATH = '' } stages { + stage("Set git config"){ + steps{ + sh '''#!/bin/bash + cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign + chmod 600 /config/.ssh/id_sign + ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub + echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits" + git config --global gpg.format ssh + git config --global user.signingkey /config/.ssh/id_sign + git config --global commit.gpgsign true + ''' + } + } // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then @@ -391,9 +407,9 @@ pipeline { echo "Updating Unraid template" cd ${TEMPDIR}/unraid/templates/ GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then + if grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then echo "Image is on the ignore list, and already in the deprecation folder." - elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + elif grep -wq "^${CONTAINER_NAME}$" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, marking Unraid template as deprecated" cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add -u unraid/${CONTAINER_NAME}.xml @@ -486,10 +502,10 @@ pipeline { } } /* ####################### - GitLab Mirroring + GitLab Mirroring and Quay.io Repo Visibility ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint - stage("GitLab Mirror"){ + // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public + stage("GitLab Mirror and Quay.io Visibility"){ when { environment name: 'EXIT_STATUS', value: '' } @@ -505,6 +521,8 @@ pipeline { "visibility":"public"}' ''' sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' + sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \ + -d '{"visibility":"public"}' ||: ''' } } /* ############### @@ -599,7 +617,7 @@ pipeline { --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { + retry_backoff(5,5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } sh '''#! /bin/bash @@ -755,7 +773,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -773,7 +791,7 @@ pipeline { docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} + docker push ${PUSHIMAGE}:${SEMVER} fi done ''' @@ -796,7 +814,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -859,7 +877,7 @@ pipeline { "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json @@ -991,6 +1009,13 @@ EOF ###################### */ post { always { + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' script{ if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' @@ -1020,3 +1045,20 @@ EOF } } } + +def retry_backoff(int max_attempts, int power_base, Closure c) { + int n = 0 + while (n < max_attempts) { + try { + c() + return + } catch (err) { + if ((n + 1) >= max_attempts) { + throw err + } + sleep(power_base ** n) + n++ + } + } + return +} From e682e1aaa15a30397fd7b998c3e3e7f5b60e8b26 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Aug 2024 18:26:56 +0000 Subject: [PATCH 379/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 45 +++++++++---------- .../workflows/external_trigger_scheduler.yml | 24 +++++----- .github/workflows/package_trigger.yml | 22 ++++----- .../workflows/package_trigger_scheduler.yml | 18 ++++---- 4 files changed, 54 insertions(+), 55 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9d0dce6..8fc0d04 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -12,17 +12,20 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/master' run: | + printf "# External trigger for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER }}" ]; then - echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\". ****" - echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving external version ****" + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY + printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name') + echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then - echo "**** Can't retrieve external version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve external version for bookstack branch master" GHA_TRIGGER_URL="https://github.com/linuxserver/docker-bookstack/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, @@ -31,9 +34,8 @@ jobs: exit 1 fi EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "**** External version: ${EXT_RELEASE} ****" - echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY - echo "**** Retrieving last pushed version ****" + echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/bookstack" tag="latest" token=$(curl -sX GET \ @@ -60,37 +62,34 @@ jobs: IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') if [ -z "${IMAGE_VERSION}" ]; then - echo "**** Can't retrieve last pushed version, exiting ****" + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY FAILURE_REASON="Can't retrieve last pushed version for bookstack tag latest" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - echo "**** Last pushed version: ${IMAGE_VERSION} ****" - echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY + echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" - echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY + echo "Version \`${EXT_RELEASE}\` 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 ****" - echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY + echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" - echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY + 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 response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=false \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index cd920fe..ae9393a 100755 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -15,31 +15,31 @@ jobs: - name: External Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# External trigger scheduler for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml) ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then - echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" + echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." - echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ -d "{\"ref\":\"refs/heads/${br}\"}" \ https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/external_trigger.yml/dispatches else - echo "**** Workflow doesn't exist; skipping trigger. ****" - echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" - echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index 28ed4ed..453e82a 100755 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -12,29 +12,29 @@ jobs: - name: Package Trigger if: github.ref == 'refs/heads/master' run: | + printf "# Package trigger for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" - echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\". ****" - echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index cb6b917..9abce6f 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -15,17 +15,19 @@ jobs: - name: Package Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# Package trigger scheduler for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ @@ -35,11 +37,9 @@ jobs: https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/package_trigger.yml/dispatches sleep 30 else - echo "**** Workflow doesn't exist; skipping trigger. ****" echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done From 951399bd495dc659611edfd22d583680737b0207 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 19 Aug 2024 18:30:42 +0000 Subject: [PATCH 380/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4b953ad..59ddb4b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -150,7 +150,7 @@ netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer nette/utils v4.0.4 php-composer nghttp2-libs 1.62.1-r0 apk -nginx 1.26.1-r0 apk +nginx 1.26.2-r0 apk nikic/php-parser v5.1.0 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer From dfc1d3192f60af570dc69858d35a866d340b8637 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 Aug 2024 18:25:50 +0000 Subject: [PATCH 381/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 59ddb4b..06ee3ba 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.7.7 binary +composer 2.7.8 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk From 9c224f5eb5b77d063cb40563da4b3ed4b1d7ec87 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 29 Aug 2024 15:36:53 +0000 Subject: [PATCH 382/452] Bot Updating Package Versions --- package_versions.txt | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 06ee3ba..ad211cc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ apr 1.7.4-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.6 php-composer -aws/aws-sdk-php 3.316.3 php-composer +aws/aws-sdk-php 3.320.7 php-composer bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer @@ -29,11 +29,11 @@ coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk curl 8.9.0-r0 apk -dasprid/enum 1.0.5 php-composer +dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.8.6 php-composer +doctrine/dbal 3.9.0 php-composer doctrine/deprecations 1.1.3 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer @@ -55,26 +55,26 @@ git 2.45.2-r0 apk git-init-template 2.45.2-r0 apk git-perl 2.45.2-r0 apk glib 2.80.2-r0 apk -graham-campbell/result-type v1.1.2 php-composer -guzzlehttp/guzzle 7.8.1 php-composer -guzzlehttp/promises 2.0.2 php-composer -guzzlehttp/psr7 2.6.2 php-composer +graham-campbell/result-type v1.1.3 php-composer +guzzlehttp/guzzle 7.9.2 php-composer +guzzlehttp/promises 2.0.3 php-composer +guzzlehttp/psr7 2.7.0 php-composer guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.1.0 php-composer -intervention/image 3.7.2 php-composer +intervention/image 3.8.0 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer larastan/larastan v2.9.8 php-composer -laravel/framework v10.48.16 php-composer -laravel/prompts v0.1.24 php-composer -laravel/serializable-closure v1.3.3 php-composer +laravel/framework v10.48.20 php-composer +laravel/prompts v0.1.25 php-composer +laravel/serializable-closure v1.3.4 php-composer laravel/socialite v5.15.1 php-composer laravel/tinker v2.9.0 php-composer -league/commonmark 2.4.2 php-composer +league/commonmark 2.5.3 php-composer league/config v1.2.0 php-composer league/flysystem 3.28.0 php-composer league/flysystem-aws-s3-v3 3.28.0 php-composer @@ -148,7 +148,7 @@ ncurses-terminfo-base 6.4_p20240420-r0 apk nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer -nette/utils v4.0.4 php-composer +nette/utils v4.0.5 php-composer nghttp2-libs 1.62.1-r0 apk nginx 1.26.2-r0 apk nikic/php-parser v5.1.0 php-composer @@ -194,16 +194,16 @@ php83-tokenizer 8.3.10-r0 apk php83-xml 8.3.10-r0 apk php83-xmlwriter 8.3.10-r0 apk php83-zip 8.3.10-r0 apk -phpmyadmin/sql-parser 5.9.0 php-composer -phpoption/phpoption 1.9.2 php-composer -phpseclib/phpseclib 3.0.39 php-composer -phpstan/phpstan 1.11.7 php-composer -phpunit/php-code-coverage 10.1.15 php-composer +phpmyadmin/sql-parser 5.9.1 php-composer +phpoption/phpoption 1.9.3 php-composer +phpseclib/phpseclib 3.0.41 php-composer +phpstan/phpstan 1.11.11 php-composer +phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.27 php-composer +phpunit/phpunit 10.5.30 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.1 php-composer predis/predis v2.2.2 php-composer @@ -215,7 +215,7 @@ psr/event-dispatcher 1.0.0 php-composer psr/http-client 1.0.3 php-composer psr/http-factory 1.1.0 php-composer psr/http-message 2.0 php-composer -psr/log 3.0.0 php-composer +psr/log 3.0.1 php-composer psr/simple-cache 3.0.0 php-composer psy/psysh v0.12.4 php-composer qt5-qtbase 5.15.10_git20230714-r2 apk @@ -229,7 +229,7 @@ scanelf 1.3.7-r2 apk sebastian/cli-parser 2.0.1 php-composer sebastian/code-unit 2.0.0 php-composer sebastian/code-unit-reverse-lookup 3.0.0 php-composer -sebastian/comparator 5.0.1 php-composer +sebastian/comparator 5.0.2 php-composer sebastian/complexity 3.2.0 php-composer sebastian/diff 5.1.1 php-composer sebastian/environment 6.1.0 php-composer @@ -249,21 +249,21 @@ socialiteproviders/manager v4.6.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.10.1 php-composer +squizlabs/php_codesniffer 3.10.2 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r29 apk -symfony/console v6.4.9 php-composer +symfony/console v6.4.10 php-composer symfony/css-selector v6.4.8 php-composer symfony/deprecation-contracts v3.5.0 php-composer symfony/dom-crawler v6.4.8 php-composer -symfony/error-handler v6.4.9 php-composer +symfony/error-handler v6.4.10 php-composer symfony/event-dispatcher v6.4.8 php-composer symfony/event-dispatcher-contracts v3.5.0 php-composer -symfony/finder v6.4.8 php-composer -symfony/http-foundation v6.4.8 php-composer -symfony/http-kernel v6.4.9 php-composer +symfony/finder v6.4.10 php-composer +symfony/http-foundation v6.4.10 php-composer +symfony/http-kernel v6.4.10 php-composer symfony/mime v6.4.9 php-composer symfony/polyfill-ctype v1.30.0 php-composer symfony/polyfill-intl-grapheme v1.30.0 php-composer @@ -275,18 +275,18 @@ symfony/polyfill-php80 v1.30.0 php-composer symfony/polyfill-php83 v1.30.0 php-composer symfony/polyfill-uuid v1.30.0 php-composer symfony/process v6.4.8 php-composer -symfony/routing v6.4.8 php-composer +symfony/routing v6.4.10 php-composer symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.9 php-composer -symfony/translation v6.4.8 php-composer +symfony/string v6.4.10 php-composer +symfony/translation v6.4.10 php-composer symfony/translation-contracts v3.5.0 php-composer symfony/uid v6.4.8 php-composer -symfony/var-dumper v6.4.9 php-composer +symfony/var-dumper v6.4.10 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024a-r1 apk utmps-libs 0.1.2.2-r1 apk -vlucas/phpdotenv v5.6.0 php-composer +vlucas/phpdotenv v5.6.1 php-composer voku/portable-ascii 2.0.1 php-composer webmozart/assert 1.11.0 php-composer xz-libs 5.6.2-r0 apk From 248b8769b4cc04b9fe64bfc130c1b76efd5d9222 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Fri, 6 Sep 2024 16:03:32 +0100 Subject: [PATCH 383/452] Add php83-exif for reading image EXIF data --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2637378..4e215eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN \ mariadb-client \ memcached \ php83-dom \ + php83-exif \ php83-gd \ php83-ldap \ php83-mysqlnd \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6a3089f..f783299 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,6 +18,7 @@ RUN \ mariadb-client \ memcached \ php83-dom \ + php83-exif \ php83-gd \ php83-ldap \ php83-mysqlnd \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f893926..d8285e6 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,7 +23,7 @@ repo_vars: - CI_WEB = 'false' - CI_PORT = '80' - CI_SSL = 'false' - - CI_DELAY = '30' + - CI_DELAY = '60' - CI_DOCKERENV='TEST_RUN=1' - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index d6f8a7f..9bfcb09 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} From fc8f5ee61ff45592b814671d64f3eab50081269d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Sep 2024 15:16:49 +0000 Subject: [PATCH 384/452] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 40292e4..f4e5a73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { CI_WEB = 'false' CI_PORT = '80' CI_SSL = 'false' - CI_DELAY = '30' + CI_DELAY = '60' CI_DOCKERENV='TEST_RUN=1' CI_AUTH = '' CI_WEBPATH = '' From 2fa72de4df55431e47923ac793ea9817232bf2c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Sep 2024 15:18:59 +0000 Subject: [PATCH 385/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6acd665..bf60c7c 100644 --- a/README.md +++ b/README.md @@ -338,6 +338,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.09.24:** - Add php-exif for reading image EXIF data. * **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. From d4a11792b7043d8a8ee271eb0f8a8cad1703dc4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 6 Sep 2024 15:21:51 +0000 Subject: [PATCH 386/452] Bot Updating Package Versions --- package_versions.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ad211cc..5eb6fd7 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ alpine-release 3.20.2-r0 apk aom-libs 3.9.1-r0 apk apache2-utils 2.4.62-r0 apk apk-tools 2.14.4-r0 apk -apr 1.7.4-r0 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.6 php-composer @@ -23,12 +23,12 @@ ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.7.8 binary +composer 2.7.9 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.0-r0 apk +curl 8.9.1-r1 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer @@ -54,7 +54,7 @@ gdbm 1.23-r1 apk git 2.45.2-r0 apk git-init-template 2.45.2-r0 apk git-perl 2.45.2-r0 apk -glib 2.80.2-r0 apk +glib 2.80.4-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer guzzlehttp/promises 2.0.3 php-composer @@ -89,13 +89,13 @@ libavif 1.0.4-r0 apk libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.1-r3 apk -libcurl 8.9.0-r0 apk +libcrypto3 3.3.2-r0 apk +libcurl 8.9.1-r1 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk libevent 2.1.12-r7 apk -libexpat 2.6.2-r0 apk +libexpat 2.6.3-r0 apk libffi 3.4.6-r0 apk libfontenc 1.1.8-r0 apk libgcc 13.2.1_git20240309-r0 apk @@ -116,7 +116,7 @@ libsasl 2.1.28-r6 apk libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.1-r3 apk +libssl3 3.3.2-r0 apk libstdc++ 13.2.1_git20240309-r0 apk libunistring 1.2-r0 apk libuuid 2.40.1-r1 apk @@ -156,7 +156,7 @@ nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.1-r3 apk +openssl 3.3.2-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -173,6 +173,7 @@ php83-common 8.3.10-r0 apk php83-ctype 8.3.10-r0 apk php83-curl 8.3.10-r0 apk php83-dom 8.3.10-r0 apk +php83-exif 8.3.10-r0 apk php83-fileinfo 8.3.10-r0 apk php83-fpm 8.3.10-r0 apk php83-gd 8.3.10-r0 apk From 9e5e0c3fbb50c817d9ac9ee4f0d909c169912b0b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Sep 2024 18:28:54 +0000 Subject: [PATCH 387/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5eb6fd7..4d5f076 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ Hidden Input 1, 0, 0, 0 dotnet alpine-baselayout 3.6.5-r0 apk alpine-baselayout-data 3.6.5-r0 apk alpine-keys 2.4-r1 apk -alpine-release 3.20.2-r0 apk +alpine-release 3.20.3-r0 apk aom-libs 3.9.1-r0 apk apache2-utils 2.4.62-r0 apk apk-tools 2.14.4-r0 apk @@ -28,7 +28,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.1-r1 apk +curl 8.10.0-r0 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer @@ -90,7 +90,7 @@ libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r0 apk -libcurl 8.9.1-r1 apk +libcurl 8.10.0-r0 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk @@ -107,7 +107,7 @@ libldap 2.6.7-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r0 apk +libncursesw 6.4_p20240420-r1 apk libpcre2-16 10.43-r0 apk libpng 1.6.43-r0 apk libproc2 4.0.4-r0 apk @@ -144,7 +144,7 @@ musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk myclabs/deep-copy 1.12.0 php-composer nano 8.0-r0 apk -ncurses-terminfo-base 6.4_p20240420-r0 apk +ncurses-terminfo-base 6.4_p20240420-r1 apk nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.0 php-composer @@ -285,7 +285,7 @@ symfony/uid v6.4.8 php-composer symfony/var-dumper v6.4.10 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2024a-r1 apk +tzdata 2024b-r0 apk utmps-libs 0.1.2.2-r1 apk vlucas/phpdotenv v5.6.1 php-composer voku/portable-ascii 2.0.1 php-composer From c42dd8184773e6a015a5e3b7c25f5df6008d9a03 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Sep 2024 18:27:58 +0000 Subject: [PATCH 388/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 4d5f076..7bb7c0f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -54,7 +54,7 @@ gdbm 1.23-r1 apk git 2.45.2-r0 apk git-init-template 2.45.2-r0 apk git-perl 2.45.2-r0 apk -glib 2.80.4-r0 apk +glib 2.80.5-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer guzzlehttp/promises 2.0.3 php-composer @@ -103,13 +103,13 @@ libice 1.1.1-r6 apk libidn2 2.3.7-r0 apk libintl 0.22.5-r0 apk libjpeg-turbo 3.0.3-r0 apk -libldap 2.6.7-r0 apk +libldap 2.6.8-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk libmount 2.40.1-r1 apk libncursesw 6.4_p20240420-r1 apk libpcre2-16 10.43-r0 apk -libpng 1.6.43-r0 apk +libpng 1.6.44-r0 apk libproc2 4.0.4-r0 apk libpsl 0.21.5-r1 apk libsasl 2.1.28-r6 apk From ef194d4e9c0ae024c0d479e7c5b256fed8396f3e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 18:27:18 +0000 Subject: [PATCH 389/452] Bot Updating Templated Files --- Jenkinsfile | 60 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f4e5a73..33edd61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -84,7 +84,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT 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 ./.github/workflows/package_trigger.yml' + 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' } sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' @@ -321,7 +321,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -729,6 +729,14 @@ pipeline { } sh '''#! /bin/bash set -e + if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then + echo "Detected baseimage, setting LSIO_FIRST_PARTY=true" + if [ -n "${CI_DOCKERENV}" ]; then + CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}" + else + CI_DOCKERENV="LSIO_FIRST_PARTY=true" + fi + fi docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 @@ -741,6 +749,7 @@ pipeline { -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ + -e RELEASE_TAG=\"latest\" \ -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ @@ -750,6 +759,7 @@ pipeline { -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e NODE_NAME=\"${NODE_NAME}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -1017,17 +1027,45 @@ EOF git config --global --unset commit.gpgsign ''' script{ + env.JOB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' - } - else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ - "username": "Jenkins"}' ${BUILDS_DISCORD} ''' - } - else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + }else{ + if (currentBuild.currentResult == "SUCCESS"){ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=1681177 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + }else{ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=16711680 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + } + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\ + "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\ + "timestamp": "'${JOB_DATE}'",\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } From bd625285f78c83a88a2fddb1b1e9bd61190a03c6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 18:28:48 +0000 Subject: [PATCH 390/452] Bot Updating Templated Files --- .github/workflows/package_trigger.yml | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100755 .github/workflows/package_trigger.yml diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml deleted file mode 100755 index 453e82a..0000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-master: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Package Trigger - if: github.ref == 'refs/heads/master' - run: | - printf "# Package trigger for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER }}" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY - exit 0 - fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY - exit 0 - fi - echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" From 1ecb3fb7a24020d76df2e38a498ae289dcaed4ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 18:30:03 +0000 Subject: [PATCH 391/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 64 +++++++++++-------- .../workflows/package_trigger_scheduler.yml | 64 ++++++++++++++----- README.md | 3 +- 3 files changed, 89 insertions(+), 42 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8fc0d04..a291b48 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -11,15 +11,17 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/master' + env: + SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER }}" ]; then + if grep -q "^bookstack_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bookstack_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_BOOKSTACK_MASTER\`" >> $GITHUB_STEP_SUMMARY + echo "> External trigger running off of master branch. To disable this trigger, add \`bookstack_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY @@ -78,26 +80,38 @@ jobs: echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 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 - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=false \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --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}" - 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 }} + if [[ "${artifacts_found}" == "false" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY + FAILURE_REASON="New version ${EXT_RELEASE} for bookstack tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later." + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "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 + if "${artifacts_found}" == "true" ]]; then + echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY + fi + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --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}" + 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 }} + fi fi diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 9abce6f..35c7083 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -14,6 +14,8 @@ jobs: fetch-depth: '0' - name: Package Trigger Scheduler + env: + SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }} run: | printf "# Package trigger scheduler for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY @@ -24,27 +26,57 @@ jobs: continue fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml | yq -r '.ls_branch') - if [ "${br}" == "${ls_branch}" ]; then + JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml) + if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif grep -q "^bookstack_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`bookstack_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + else + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY + printf "> To disable, add \`bookstack_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-bookstack/actions/workflows/package_trigger.yml/dispatches - sleep 30 - else - echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + sleep 20 fi else echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" - echo "**** Notifying Discord ****" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for bookstack** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bookstack/activity/"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then + if [[ -n "${triggered_branches}" ]]; then + NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + fi + if [[ -n "${skipped_branches}" ]]; then + NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" + fi + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for bookstack** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bookstack/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/README.md b/README.md index bf60c7c..4a82432 100644 --- a/README.md +++ b/README.md @@ -313,7 +313,8 @@ Below are the instructions for updating containers: ### Image Update Notifications - Diun (Docker Image Update Notifier) -**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. +>[!TIP] +>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported. ## Building locally From 23e32dc35e130b6c851970c293ef09bf2cbba8df Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 30 Sep 2024 18:33:03 +0000 Subject: [PATCH 392/452] Bot Updating Package Versions --- package_versions.txt | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7bb7c0f..5a4e8bc 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.10.0-r0 apk +curl 8.9.1-r2 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer @@ -90,7 +90,7 @@ libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r0 apk -libcurl 8.10.0-r0 apk +libcurl 8.9.1-r2 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk @@ -168,33 +168,33 @@ phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer phenx/php-font-lib 0.5.6 php-composer phenx/php-svg-lib 0.5.4 php-composer -php83 8.3.10-r0 apk -php83-common 8.3.10-r0 apk -php83-ctype 8.3.10-r0 apk -php83-curl 8.3.10-r0 apk -php83-dom 8.3.10-r0 apk -php83-exif 8.3.10-r0 apk -php83-fileinfo 8.3.10-r0 apk -php83-fpm 8.3.10-r0 apk -php83-gd 8.3.10-r0 apk -php83-iconv 8.3.10-r0 apk -php83-ldap 8.3.10-r0 apk -php83-mbstring 8.3.10-r0 apk -php83-mysqlnd 8.3.10-r0 apk -php83-openssl 8.3.10-r0 apk -php83-pdo 8.3.10-r0 apk -php83-pdo_mysql 8.3.10-r0 apk +php83 8.3.12-r0 apk +php83-common 8.3.12-r0 apk +php83-ctype 8.3.12-r0 apk +php83-curl 8.3.12-r0 apk +php83-dom 8.3.12-r0 apk +php83-exif 8.3.12-r0 apk +php83-fileinfo 8.3.12-r0 apk +php83-fpm 8.3.12-r0 apk +php83-gd 8.3.12-r0 apk +php83-iconv 8.3.12-r0 apk +php83-ldap 8.3.12-r0 apk +php83-mbstring 8.3.12-r0 apk +php83-mysqlnd 8.3.12-r0 apk +php83-openssl 8.3.12-r0 apk +php83-pdo 8.3.12-r0 apk +php83-pdo_mysql 8.3.12-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.2.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.10-r0 apk -php83-session 8.3.10-r0 apk -php83-simplexml 8.3.10-r0 apk -php83-sockets 8.3.10-r0 apk -php83-tokenizer 8.3.10-r0 apk -php83-xml 8.3.10-r0 apk -php83-xmlwriter 8.3.10-r0 apk -php83-zip 8.3.10-r0 apk +php83-phar 8.3.12-r0 apk +php83-session 8.3.12-r0 apk +php83-simplexml 8.3.12-r0 apk +php83-sockets 8.3.12-r0 apk +php83-tokenizer 8.3.12-r0 apk +php83-xml 8.3.12-r0 apk +php83-xmlwriter 8.3.12-r0 apk +php83-zip 8.3.12-r0 apk phpmyadmin/sql-parser 5.9.1 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.41 php-composer From e32e3ce745891be544f7851be45b5b8901e79733 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 9 Oct 2024 10:42:32 +0000 Subject: [PATCH 393/452] Bot Updating Package Versions --- package_versions.txt | 87 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5a4e8bc..bb655b5 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,8 +11,8 @@ apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk aws/aws-crt-php v1.2.6 php-composer -aws/aws-sdk-php 3.320.7 php-composer -bacon/bacon-qr-code 2.0.8 php-composer +aws/aws-sdk-php 3.322.6 php-composer +bacon/bacon-qr-code v3.0.0 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk @@ -33,17 +33,19 @@ dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.9.0 php-composer +doctrine/dbal 3.9.1 php-composer doctrine/deprecations 1.1.3 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer -dompdf/dompdf v2.0.8 php-composer +dompdf/dompdf v3.0.0 php-composer +dompdf/php-font-lib 1.0.0 php-composer +dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.3.3 php-composer egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.1 php-composer -filp/whoops 2.15.4 php-composer +filp/whoops 2.16.0 php-composer findutils 4.9.0-r5 apk firebase/php-jwt v6.10.1 php-composer font-freefont 20120503-r4 apk @@ -63,24 +65,24 @@ guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk -intervention/gif 4.1.0 php-composer +intervention/gif 4.2.0 php-composer intervention/image 3.8.0 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer larastan/larastan v2.9.8 php-composer -laravel/framework v10.48.20 php-composer +laravel/framework v10.48.22 php-composer laravel/prompts v0.1.25 php-composer -laravel/serializable-closure v1.3.4 php-composer -laravel/socialite v5.15.1 php-composer -laravel/tinker v2.9.0 php-composer +laravel/serializable-closure v1.3.5 php-composer +laravel/socialite v5.16.0 php-composer +laravel/tinker v2.10.0 php-composer league/commonmark 2.5.3 php-composer league/config v1.2.0 php-composer league/flysystem 3.28.0 php-composer league/flysystem-aws-s3-v3 3.28.0 php-composer league/flysystem-local 3.28.0 php-composer league/html-to-markdown 5.1.1 php-composer -league/mime-type-detection 1.15.0 php-composer +league/mime-type-detection 1.16.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer libacl 2.3.2-r0 apk @@ -139,7 +141,7 @@ memcached 1.6.27-r0 apk mkfontscale 1.2.2-r6 apk mockery/mockery 1.6.12 php-composer monolog/monolog 3.7.0 php-composer -mtdowling/jmespath.php 2.7.0 php-composer +mtdowling/jmespath.php 2.8.0 php-composer musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk myclabs/deep-copy 1.12.0 php-composer @@ -151,13 +153,13 @@ nette/schema v1.3.0 php-composer nette/utils v4.0.5 php-composer nghttp2-libs 1.62.1-r0 apk nginx 1.26.2-r0 apk -nikic/php-parser v5.1.0 php-composer +nikic/php-parser v5.2.0 php-composer nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.2-r0 apk -paragonie/constant_time_encoding v2.7.0 php-composer +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 @@ -166,8 +168,6 @@ perl-error 0.17029-r2 apk perl-git 2.45.2-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -phenx/php-font-lib 0.5.6 php-composer -phenx/php-svg-lib 0.5.4 php-composer php83 8.3.12-r0 apk php83-common 8.3.12-r0 apk php83-ctype 8.3.12-r0 apk @@ -195,18 +195,18 @@ php83-tokenizer 8.3.12-r0 apk php83-xml 8.3.12-r0 apk php83-xmlwriter 8.3.12-r0 apk php83-zip 8.3.12-r0 apk -phpmyadmin/sql-parser 5.9.1 php-composer +phpmyadmin/sql-parser 5.10.0 php-composer phpoption/phpoption 1.9.3 php-composer -phpseclib/phpseclib 3.0.41 php-composer -phpstan/phpstan 1.11.11 php-composer +phpseclib/phpseclib 3.0.42 php-composer +phpstan/phpstan 1.12.5 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.30 php-composer +phpunit/phpunit 10.5.35 php-composer popt 1.19-r3 apk -pragmarx/google2fa v8.0.1 php-composer +pragmarx/google2fa v8.0.3 php-composer predis/predis v2.2.2 php-composer procps-ng 4.0.4-r0 apk psr/cache 3.0.0 php-composer @@ -216,7 +216,7 @@ psr/event-dispatcher 1.0.0 php-composer psr/http-client 1.0.3 php-composer psr/http-factory 1.1.0 php-composer psr/http-message 2.0 php-composer -psr/log 3.0.1 php-composer +psr/log 3.0.2 php-composer psr/simple-cache 3.0.0 php-composer psy/psysh v0.12.4 php-composer qt5-qtbase 5.15.10_git20230714-r2 apk @@ -250,39 +250,38 @@ socialiteproviders/manager v4.6.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.10.2 php-composer +squizlabs/php_codesniffer 3.10.3 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r29 apk -symfony/console v6.4.10 php-composer +symfony/console v6.4.12 php-composer symfony/css-selector v6.4.8 php-composer symfony/deprecation-contracts v3.5.0 php-composer -symfony/dom-crawler v6.4.8 php-composer +symfony/dom-crawler v6.4.12 php-composer symfony/error-handler v6.4.10 php-composer symfony/event-dispatcher v6.4.8 php-composer symfony/event-dispatcher-contracts v3.5.0 php-composer -symfony/finder v6.4.10 php-composer -symfony/http-foundation v6.4.10 php-composer -symfony/http-kernel v6.4.10 php-composer -symfony/mime v6.4.9 php-composer -symfony/polyfill-ctype v1.30.0 php-composer -symfony/polyfill-intl-grapheme v1.30.0 php-composer -symfony/polyfill-intl-idn v1.30.0 php-composer -symfony/polyfill-intl-normalizer v1.30.0 php-composer -symfony/polyfill-mbstring v1.30.0 php-composer -symfony/polyfill-php72 v1.30.0 php-composer -symfony/polyfill-php80 v1.30.0 php-composer -symfony/polyfill-php83 v1.30.0 php-composer -symfony/polyfill-uuid v1.30.0 php-composer -symfony/process v6.4.8 php-composer -symfony/routing v6.4.10 php-composer +symfony/finder v6.4.11 php-composer +symfony/http-foundation v6.4.12 php-composer +symfony/http-kernel v6.4.12 php-composer +symfony/mime v6.4.12 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 v6.4.12 php-composer +symfony/routing v6.4.12 php-composer symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.10 php-composer -symfony/translation v6.4.10 php-composer +symfony/string v6.4.12 php-composer +symfony/translation v6.4.12 php-composer symfony/translation-contracts v3.5.0 php-composer -symfony/uid v6.4.8 php-composer -symfony/var-dumper v6.4.10 php-composer +symfony/uid v6.4.12 php-composer +symfony/var-dumper v6.4.11 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024b-r0 apk From 4cb461015061761df6dea054515c2119fee32ed7 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sat, 12 Oct 2024 19:28:51 +0100 Subject: [PATCH 394/452] Simplify init, prefer envs, make fewer assumptions --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Jenkinsfile | 4 +- README.md | 51 +++------ jenkins-vars.yml | 4 +- readme-vars.yml | 54 ++-------- .../s6-rc.d/init-bookstack-config/run | 102 +++--------------- 7 files changed, 44 insertions(+), 175 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4e215eb..d97c5b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG BUILD_DATE ARG VERSION ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="homerr" +LABEL maintainer="thespad" ENV S6_STAGE2_HOOK="/init-hook" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f783299..5436878 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,7 +7,7 @@ ARG BUILD_DATE ARG VERSION ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="homerr" +LABEL maintainer="thespad" ENV S6_STAGE2_HOOK="/init-hook" diff --git a/Jenkinsfile b/Jenkinsfile index 33edd61..712bba9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,12 +31,12 @@ pipeline { PR_DOCKERHUB_IMAGE = 'lspipepr/bookstack' DIST_IMAGE = 'alpine' MULTIARCH = 'true' - CI = 'true' + CI = 'false' CI_WEB = 'false' CI_PORT = '80' CI_SSL = 'false' CI_DELAY = '60' - CI_DOCKERENV='TEST_RUN=1' + CI_DOCKERENV='' CI_AUTH = '' CI_WEBPATH = '' } diff --git a/README.md b/README.md index 4a82432..4026fed 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ Find us at: [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/bookstack.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/bookstack) [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-bookstack%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/master/) -[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fbookstack%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/bookstack/latest/index.html) [Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. @@ -63,11 +62,10 @@ The architectures supported by this image are: ## Application Setup -The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. +The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. @@ -79,8 +77,8 @@ Below is a mapping of container `/config` paths to those relative within a BookS - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` -- `/config/www/laravel.log` => `storage/logs/laravel.log` -- `/config/www/backups/` => `storage/backups/` +- `/config/log/bookstack/laravel.log` => `storage/logs/laravel.log` +- `/config/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` @@ -101,40 +99,24 @@ To help you get started creating a container from this image you can either use --- services: bookstack: - image: lscr.io/linuxserver/bookstack + image: lscr.io/linuxserver/bookstack:latest container_name: bookstack environment: - PUID=1000 - PGID=1000 - - TZ=Europe/London - - APP_URL=https://bookstack.example.com - - DB_HOST=bookstack_db - - DB_PORT=3306 - - DB_USER=bookstack - - DB_PASS=<yourdbpass> + - TZ=Etc/UTC + - APP_URL=yourbaseurl + - DB_HOST=yourdbhost + - DB_PORT=yourdbport + - DB_USERNAME=yourdbuser + - DB_PASSWORD=yourdbpass - DB_DATABASE=bookstackapp + - QUEUE_CONNECTION= #optional volumes: - - /path/to/bookstack_app_data:/config + - /path/to/bookstack/config:/config ports: - 6875:80 restart: unless-stopped - depends_on: - - bookstack_db - - bookstack_db: - image: lscr.io/linuxserver/mariadb - container_name: bookstack_db - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/London - - MYSQL_ROOT_PASSWORD=<yourdbpass> - - MYSQL_DATABASE=bookstackapp - - MYSQL_USER=bookstack - - MYSQL_PASSWORD=<yourdbpass> - volumes: - - /path/to/bookstack_db_data:/config - restart: unless-stopped ``` ### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/)) @@ -148,8 +130,8 @@ docker run -d \ -e APP_URL=yourbaseurl \ -e DB_HOST=yourdbhost \ -e DB_PORT=yourdbport \ - -e DB_USER=yourdbuser \ - -e DB_PASS=yourdbpass \ + -e DB_USERNAME=yourdbuser \ + -e DB_PASSWORD=yourdbpass \ -e DB_DATABASE=bookstackapp \ -e QUEUE_CONNECTION= `#optional` \ -p 6875:80 \ @@ -171,8 +153,8 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e APP_URL=yourbaseurl` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | | `-e DB_HOST=yourdbhost` | for specifying the database host | | `-e DB_PORT=yourdbport` | for specifying the database port if not default 3306 | -| `-e DB_USER=yourdbuser` | for specifying the database user | -| `-e DB_PASS=yourdbpass` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | +| `-e DB_USERNAME=yourdbuser` | for specifying the database user | +| `-e DB_PASSWORD=yourdbpass` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | | `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling). | | `-v /config` | Persistent config files | @@ -339,6 +321,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.10.24:** - Default to environment config over .env file config. * **06.09.24:** - Add php-exif for reading image EXIF data. * **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index d8285e6..11a6cda 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -19,11 +19,11 @@ repo_vars: - PR_DOCKERHUB_IMAGE = 'lspipepr/bookstack' - DIST_IMAGE = 'alpine' - MULTIARCH = 'true' - - CI = 'true' + - CI = 'false' - CI_WEB = 'false' - CI_PORT = '80' - CI_SSL = 'false' - CI_DELAY = '60' - - CI_DOCKERENV='TEST_RUN=1' + - CI_DOCKERENV='' - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index 9bfcb09..66aca1f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -27,8 +27,8 @@ param_env_vars: - { env_var: "APP_URL", env_value: "yourbaseurl", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - { env_var: "DB_HOST", env_value: "yourdbhost", desc: "for specifying the database host" } - { env_var: "DB_PORT", env_value: "yourdbport", desc: "for specifying the database port if not default 3306" } - - { env_var: "DB_USER", env_value: "yourdbuser", desc: "for specifying the database user" } - - { env_var: "DB_PASS", env_value: "yourdbpass", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "DB_USERNAME", env_value: "yourdbuser", desc: "for specifying the database user" } + - { env_var: "DB_PASSWORD", env_value: "yourdbpass", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } param_usage_include_ports: true @@ -39,80 +39,42 @@ opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)." } -custom_compose: | - --- - services: - bookstack: - image: lscr.io/linuxserver/bookstack - container_name: bookstack - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/London - - APP_URL=https://bookstack.example.com - - DB_HOST=bookstack_db - - DB_PORT=3306 - - DB_USER=bookstack - - DB_PASS=<yourdbpass> - - DB_DATABASE=bookstackapp - volumes: - - /path/to/bookstack_app_data:/config - ports: - - 6875:80 - restart: unless-stopped - depends_on: - - bookstack_db - - bookstack_db: - image: lscr.io/linuxserver/mariadb - container_name: bookstack_db - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/London - - MYSQL_ROOT_PASSWORD=<yourdbpass> - - MYSQL_DATABASE=bookstackapp - - MYSQL_USER=bookstack - - MYSQL_PASSWORD=<yourdbpass> - volumes: - - /path/to/bookstack_db_data:/config - restart: unless-stopped - # application setup block app_setup_block_enabled: true app_setup_block: | - The default username is admin@admin.com with the password of **password**, access the container at http://dockerhost:6875. + The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. - If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. ### BookStack File & Directory Paths + This container ensures certain BookStack application files & folders, such as user file upload folders, are retained within the `/config` folder so that they are persistent & accessible when the `/config` container path is bound as a volume. There may be cases, when following the BookStack documentation, that you'll need to know how these files and folders are used relative to a non-container BookStack installation. Below is a mapping of container `/config` paths to those relative within a BookStack install directory: - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` - - `/config/www/laravel.log` => `storage/logs/laravel.log` - - `/config/www/backups/` => `storage/backups/` + - `/config/log/bookstack/laravel.log` => `storage/logs/laravel.log` + - `/config/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` - `/config/www/uploads/` => `public/uploads/` ### Advanced Users (full control over the .env file) + If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. - # changelog changelogs: + - { date: "11.10.24:", desc: "Default to environment config over .env file config."} - { date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 39aa3bf..ffabb69 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -44,86 +44,13 @@ if [[ ! -L "/app/www/storage/logs" ]]; then ln -s "/config/log/bookstack" "/app/www/storage/logs" fi -# Echo init finish for test runs -if [ -n "${TEST_RUN}" ]; then - echo '[ls.io-init] done.' -fi - -# Create API key if needed -if [ ! -f "/config/BOOKSTACK_APP_KEY.txt" ]; then - echo "Generating BookStack app key for first run" - key=$(php /app/www/artisan key:generate --show) - echo "${key}" >/config/BOOKSTACK_APP_KEY.txt - echo "App Key set to ${key} you can modify the file to update /config/BOOKSTACK_APP_KEY.txt" -elif [ -f "/config/BOOKSTACK_APP_KEY.txt" ]; then - echo "App Key found - setting variable for seds" - key=$(cat /config/BOOKSTACK_APP_KEY.txt) -fi - -# .env file setup -# check for the default app key or if it has been updated -if ! grep -Fxq "APP_KEY=${key}" /config/www/.env; then - sed -i "s#^APP_KEY=.*#APP_KEY=${key}#" /config/www/.env -fi - -# if DB_HOST contains a port and DB_HOST is not a IPv6 without brackets [..] -# support ipv4:port, [ipv6]:port, and domain:port -if [[ ${DB_HOST} =~ :[0-9]+$ ]] && ! [[ ${DB_HOST} =~ ^(:{0,2}[a-fA-F0-9]{1,4})+$ ]]; then - DB_HOST_PORT="${DB_HOST}" -fi - -# if DB_HOST_PORT is set -if [[ -n "${DB_HOST_PORT}" ]]; then - # if DB_PORT is set - if [[ -n "${DB_PORT}" ]]; then - echo "DB_PORT is not supported when using DB_HOST with port" +# Check for app key +if [[ -z ${APP_KEY} ]]; then + if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /app/www/.env 2> /dev/null; then + echo "An application key is missing, halting init!" + echo "You can generate a key with: docker exec -it bookstack php /app/www/artisan key:generate --show" sleep infinity fi - DB_HOST="${DB_HOST_PORT%:*}" - DB_PORT="${DB_HOST_PORT##*:}" -fi - -# if DB_PORT is not set -if [[ -z "${DB_PORT}" ]]; then - DB_PORT="3306" -fi - -# check to see if DB_HOST is set, if it is then run seds and if not then leave them -if [[ -n "${DB_HOST}" ]]; then - echo "Running config - DB_HOST set" - - if ! grep -xqE "^[#]?DB_PORT=.*" /config/www/.env; then - # add DB_PORT line to /config/www/.env because current /app/www/.env.example doesn't have it - sed -i -E "/^[#]?DB_HOST=.*/a DB_PORT='${DB_PORT}'" /config/www/.env - echo "**** Insert DB_PORT='${DB_PORT}' into /config/www/.env ****" - fi - - sed -i -E "s/^[#]?DB_HOST=.*/DB_HOST='${DB_HOST}'/g" /config/www/.env - sed -i -E "s/^[#]?DB_PORT=.*/DB_PORT='${DB_PORT}'/g" /config/www/.env - SED_DB_DATABASE=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_DATABASE}") - sed -i -E "s/^[#]?DB_DATABASE=.*/DB_DATABASE='${SED_DB_DATABASE}'/g" /config/www/.env - SED_DB_USER=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_USER}") - sed -i -E "s/^[#]?DB_USERNAME=.*/DB_USERNAME='${SED_DB_USER}'/g" /config/www/.env - SED_DB_PASS=$(sed -e 's|[&\\/]|\\&|g; s|$|\\|; $s|\\$||' <<<"${DB_PASS}") - sed -i -E "s/^[#]?DB_PASSWORD=.*/DB_PASSWORD='${SED_DB_PASS}'/g" /config/www/.env -fi - -# set appurl -if [ -z "${APP_URL}" ]; then - EXT_IP=$(curl -s https://icanhazip.com) - APP_URL="http://${EXT_IP}:6875" - echo "**** Docker env var APP_URL is not set, setting it to ${APP_URL} ****" -fi -OLD_URL=$(grep APP_URL /config/www/.env | sed 's|.*APP_URL=||g') -if [ "${APP_URL}" != "${OLD_URL}" ]; then - sed -r "s,([#\s]*)?APP_URL=.*,APP_URL=${APP_URL},g" -i /config/www/.env - echo "**** APP_URL in /config/www/.env is being updated from ${OLD_URL} to ${APP_URL} ****" - if [ "${OLD_URL}" != "http://example.com" ]; then - echo "**** If this is an existing install, you should run the following line from your host terminal to update the database URL entries: ****" - echo "************************************************************************" - echo "docker exec -it bookstack php /app/www/artisan bookstack:update-url ${OLD_URL} ${APP_URL}" - echo "************************************************************************" - fi fi ## Bump php upload max filesize and post max size to 100MB by default @@ -134,33 +61,30 @@ if ! grep -qx '^post_max_size.*$' /config/php/php-local.ini; then echo 'post_max_size = 100M' >>/config/php/php-local.ini fi +# if DB_PORT is not set +if [[ -z "${DB_PORT}" ]]; then + DB_PORT="3306" +fi + # check for the mysql endpoint echo "Waiting for DB to be available" END=$((SECONDS + 30)) while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then - if [[ -n "${RUN}" ]]; then - break - fi - RUN="RAN" - # we sleep here again due to first run init on DB containers if [[ ! -f /dbwait.lock ]]; then sleep 5 fi + touch /dbwait.lock + break else sleep 1 fi done # update database - will set up database if fresh, or, migrate existing -if [ -z "${CI_RUN+x}" ]; then - php /app/www/artisan migrate --force -fi +php /app/www/artisan migrate --force # permissions lsiown -R abc:abc \ /app/www/storage \ /config - -# set lockfile to avoid DB waits for this specific container -touch /dbwait.lock From 448b16865ff906870e22fba0233c2e88fd865253 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sat, 12 Oct 2024 20:19:24 +0100 Subject: [PATCH 395/452] Fix unhelpful default values --- README.md | 38 ++++++++++++++++++++------------------ readme-vars.yml | 12 ++++++------ 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 4026fed..8acea47 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ If you intend to use this application behind a subfolder reverse proxy, such as Documentation for BookStack can be found at https://www.bookstackapp.com/docs/. ### BookStack File & Directory Paths + This container ensures certain BookStack application files & folders, such as user file upload folders, are retained within the `/config` folder so that they are persistent & accessible when the `/config` container path is bound as a volume. There may be cases, when following the BookStack documentation, that you'll need to know how these files and folders are used relative to a non-container BookStack installation. Below is a mapping of container `/config` paths to those relative within a BookStack install directory: @@ -85,6 +86,7 @@ Below is a mapping of container `/config` paths to those relative within a BookS - `/config/www/uploads/` => `public/uploads/` ### Advanced Users (full control over the .env file) + If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. @@ -105,12 +107,12 @@ services: - PUID=1000 - PGID=1000 - TZ=Etc/UTC - - APP_URL=yourbaseurl - - DB_HOST=yourdbhost - - DB_PORT=yourdbport - - DB_USERNAME=yourdbuser - - DB_PASSWORD=yourdbpass - - DB_DATABASE=bookstackapp + - APP_URL= + - DB_HOST= + - DB_PORT=3306 + - DB_USERNAME= + - DB_PASSWORD= + - DB_DATABASE= - QUEUE_CONNECTION= #optional volumes: - /path/to/bookstack/config:/config @@ -127,12 +129,12 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Etc/UTC \ - -e APP_URL=yourbaseurl \ - -e DB_HOST=yourdbhost \ - -e DB_PORT=yourdbport \ - -e DB_USERNAME=yourdbuser \ - -e DB_PASSWORD=yourdbpass \ - -e DB_DATABASE=bookstackapp \ + -e APP_URL= \ + -e DB_HOST= \ + -e DB_PORT=3306 \ + -e DB_USERNAME= \ + -e DB_PASSWORD= \ + -e DB_DATABASE= \ -e QUEUE_CONNECTION= `#optional` \ -p 6875:80 \ -v /path/to/bookstack/config:/config \ @@ -150,12 +152,12 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e APP_URL=yourbaseurl` | for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | -| `-e DB_HOST=yourdbhost` | for specifying the database host | -| `-e DB_PORT=yourdbport` | for specifying the database port if not default 3306 | -| `-e DB_USERNAME=yourdbuser` | for specifying the database user | -| `-e DB_PASSWORD=yourdbpass` | for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | -| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | +| `-e APP_URL=` | The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | +| `-e DB_HOST=` | The database instance hostname | +| `-e DB_PORT=3306` | Database port (default `3306`) | +| `-e DB_USERNAME=` | Database user | +| `-e DB_PASSWORD=` | Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | +| `-e DB_DATABASE=` | Database name | | `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling). | | `-v /config` | Persistent config files | diff --git a/readme-vars.yml b/readme-vars.yml index 66aca1f..d6e2c47 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,12 +24,12 @@ param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_env: true param_env_vars: - - { env_var: "APP_URL", env_value: "yourbaseurl", desc: "for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - - { env_var: "DB_HOST", env_value: "yourdbhost", desc: "for specifying the database host" } - - { env_var: "DB_PORT", env_value: "yourdbport", desc: "for specifying the database port if not default 3306" } - - { env_var: "DB_USERNAME", env_value: "yourdbuser", desc: "for specifying the database user" } - - { env_var: "DB_PASSWORD", env_value: "yourdbpass", desc: "for specifying the database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } + - { env_var: "APP_URL", env_value: "", desc: "The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - { env_var: "DB_HOST", env_value: "", desc: "The database instance hostname" } + - { env_var: "DB_PORT", env_value: "3306", desc: "Database port (default `3306`)" } + - { env_var: "DB_USERNAME", env_value: "", desc: "Database user" } + - { env_var: "DB_PASSWORD", env_value: "", desc: "Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } + - { env_var: "DB_DATABASE", env_value: "", desc: "Database name" } param_usage_include_ports: true param_ports: From be960b455b6b5107e030cbf8cb142bb8fc1f590b Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Mon, 14 Oct 2024 09:07:27 +0100 Subject: [PATCH 396/452] Add update-url note to readme --- README.md | 8 ++++++++ readme-vars.yml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/README.md b/README.md index 8acea47..8330609 100644 --- a/README.md +++ b/README.md @@ -85,6 +85,14 @@ Below is a mapping of container `/config` paths to those relative within a BookS - `/config/www/themes/` => `themes/` - `/config/www/uploads/` => `public/uploads/` +### Changing APP_URL + +If you change the APP_URL after initial install, you should run the following line from your host terminal to update the database URL entries: + +```shell +docker exec -it bookstack php /app/www/artisan bookstack:update-url ${OLD_URL} ${NEW_URL} +``` + ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. diff --git a/readme-vars.yml b/readme-vars.yml index d6e2c47..3cc7bce 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -66,6 +66,14 @@ app_setup_block: | - `/config/www/themes/` => `themes/` - `/config/www/uploads/` => `public/uploads/` + ### Changing APP_URL + + If you change the APP_URL after initial install, you should run the following line from your host terminal to update the database URL entries: + + ```shell + docker exec -it bookstack php /app/www/artisan bookstack:update-url ${OLD_URL} ${NEW_URL} + ``` + ### Advanced Users (full control over the .env file) If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. From c84517086c57dd5a3237a2818e1440ccb092e793 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Mon, 14 Oct 2024 16:12:46 +0100 Subject: [PATCH 397/452] Fix appkey check + add helper --- README.md | 3 +++ readme-vars.yml | 1 + root/appkey | 3 +++ root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 root/appkey diff --git a/README.md b/README.md index 8330609..2da64fd 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ services: - PGID=1000 - TZ=Etc/UTC - APP_URL= + - APP_KEY= - DB_HOST= - DB_PORT=3306 - DB_USERNAME= @@ -138,6 +139,7 @@ docker run -d \ -e PGID=1000 \ -e TZ=Etc/UTC \ -e APP_URL= \ + -e APP_KEY= \ -e DB_HOST= \ -e DB_PORT=3306 \ -e DB_USERNAME= \ @@ -161,6 +163,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-e APP_URL=` | The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | +| `-e APP_KEY=` | Session encryption key. Can be generated with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey` | | `-e DB_HOST=` | The database instance hostname | | `-e DB_PORT=3306` | Database port (default `3306`) | | `-e DB_USERNAME=` | Database user | diff --git a/readme-vars.yml b/readme-vars.yml index 3cc7bce..5c3f77d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -25,6 +25,7 @@ param_volumes: param_usage_include_env: true param_env_vars: - { env_var: "APP_URL", env_value: "", desc: "The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - { env_var: "APP_KEY", env_value: "", desc: "Session encryption key. Can be generated with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey`"} - { env_var: "DB_HOST", env_value: "", desc: "The database instance hostname" } - { env_var: "DB_PORT", env_value: "3306", desc: "Database port (default `3306`)" } - { env_var: "DB_USERNAME", env_value: "", desc: "Database user" } diff --git a/root/appkey b/root/appkey new file mode 100755 index 0000000..2e689f6 --- /dev/null +++ b/root/appkey @@ -0,0 +1,3 @@ +#!/bin/bash + +php /app/www/artisan key:generate --show diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index ffabb69..8278406 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -46,9 +46,9 @@ fi # Check for app key if [[ -z ${APP_KEY} ]]; then - if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /app/www/.env 2> /dev/null; then + if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /app/www/.env 2> /dev/null || grep -qE "APP_KEY=SomeRandomString" /app/www/.env 2> /dev/null; then echo "An application key is missing, halting init!" - echo "You can generate a key with: docker exec -it bookstack php /app/www/artisan key:generate --show" + echo "You can generate a key with: docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey" sleep infinity fi fi From 1eb8aa7e866a2d2d0303a393c23e381b340a4f9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Oct 2024 18:28:43 +0000 Subject: [PATCH 398/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index bb655b5..a1134b2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -185,7 +185,7 @@ php83-openssl 8.3.12-r0 apk php83-pdo 8.3.12-r0 apk php83-pdo_mysql 8.3.12-r0 apk php83-pecl-igbinary 3.2.15-r0 apk -php83-pecl-memcached 3.2.0-r0 apk +php83-pecl-memcached 3.3.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk php83-phar 8.3.12-r0 apk php83-session 8.3.12-r0 apk From c7819efba73fa45db1a40ad6d891a3b59cf4e745 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 28 Oct 2024 18:30:00 +0000 Subject: [PATCH 399/452] Bot Updating Package Versions --- package_versions.txt | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a1134b2..5049f98 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,12 +18,12 @@ brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk busybox 1.36.1-r29 apk busybox-binsh 1.36.1-r29 apk -c-ares 1.28.1-r0 apk +c-ares 1.33.1-r0 apk ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.7.9 binary +composer 2.8.1 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk @@ -91,7 +91,7 @@ libavif 1.0.4-r0 apk libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r0 apk +libcrypto3 3.3.2-r1 apk libcurl 8.9.1-r2 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk @@ -118,7 +118,7 @@ libsasl 2.1.28-r6 apk libseccomp 2.5.5-r1 apk libsharpyuv 1.3.2-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.2-r0 apk +libssl3 3.3.2-r1 apk libstdc++ 13.2.1_git20240309-r0 apk libunistring 1.2-r0 apk libuuid 2.40.1-r1 apk @@ -158,7 +158,7 @@ nunomaduro/collision v7.10.0 php-composer nunomaduro/termwind v1.15.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.2-r0 apk +openssl 3.3.2-r1 apk paragonie/constant_time_encoding v3.0.0 php-composer paragonie/random_compat v9.99.100 php-composer pcre 8.45-r3 apk @@ -168,33 +168,33 @@ perl-error 0.17029-r2 apk perl-git 2.45.2-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.12-r0 apk -php83-common 8.3.12-r0 apk -php83-ctype 8.3.12-r0 apk -php83-curl 8.3.12-r0 apk -php83-dom 8.3.12-r0 apk -php83-exif 8.3.12-r0 apk -php83-fileinfo 8.3.12-r0 apk -php83-fpm 8.3.12-r0 apk -php83-gd 8.3.12-r0 apk -php83-iconv 8.3.12-r0 apk -php83-ldap 8.3.12-r0 apk -php83-mbstring 8.3.12-r0 apk -php83-mysqlnd 8.3.12-r0 apk -php83-openssl 8.3.12-r0 apk -php83-pdo 8.3.12-r0 apk -php83-pdo_mysql 8.3.12-r0 apk +php83 8.3.13-r0 apk +php83-common 8.3.13-r0 apk +php83-ctype 8.3.13-r0 apk +php83-curl 8.3.13-r0 apk +php83-dom 8.3.13-r0 apk +php83-exif 8.3.13-r0 apk +php83-fileinfo 8.3.13-r0 apk +php83-fpm 8.3.13-r0 apk +php83-gd 8.3.13-r0 apk +php83-iconv 8.3.13-r0 apk +php83-ldap 8.3.13-r0 apk +php83-mbstring 8.3.13-r0 apk +php83-mysqlnd 8.3.13-r0 apk +php83-openssl 8.3.13-r0 apk +php83-pdo 8.3.13-r0 apk +php83-pdo_mysql 8.3.13-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.3.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.12-r0 apk -php83-session 8.3.12-r0 apk -php83-simplexml 8.3.12-r0 apk -php83-sockets 8.3.12-r0 apk -php83-tokenizer 8.3.12-r0 apk -php83-xml 8.3.12-r0 apk -php83-xmlwriter 8.3.12-r0 apk -php83-zip 8.3.12-r0 apk +php83-phar 8.3.13-r0 apk +php83-session 8.3.13-r0 apk +php83-simplexml 8.3.13-r0 apk +php83-sockets 8.3.13-r0 apk +php83-tokenizer 8.3.13-r0 apk +php83-xml 8.3.13-r0 apk +php83-xmlwriter 8.3.13-r0 apk +php83-zip 8.3.13-r0 apk phpmyadmin/sql-parser 5.10.0 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer From 00a782d8ae0af18ed8497d80bdb1afe06ecacc6f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 4 Nov 2024 18:29:11 +0000 Subject: [PATCH 400/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 5049f98..6e2dd9e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -134,8 +134,8 @@ libxt 1.3.0-r5 apk libzip 1.10.1-r0 apk linux-pam 1.6.0-r0 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.8-r0 apk -mariadb-common 10.11.8-r0 apk +mariadb-client 10.11.10-r0 apk +mariadb-common 10.11.10-r0 apk masterminds/html5 2.9.0 php-composer memcached 1.6.27-r0 apk mkfontscale 1.2.2-r6 apk From b8fba7f08b682cc3ba7bab5cac4065c602fd3ad2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 8 Nov 2024 15:04:57 +0000 Subject: [PATCH 401/452] Bot Updating Package Versions --- package_versions.txt | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6e2dd9e..7534489 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,9 +10,9 @@ apk-tools 2.14.4-r0 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.6 php-composer -aws/aws-sdk-php 3.322.6 php-composer -bacon/bacon-qr-code v3.0.0 php-composer +aws/aws-crt-php v1.2.7 php-composer +aws/aws-sdk-php 3.325.4 php-composer +bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk @@ -33,7 +33,7 @@ dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.9.1 php-composer +doctrine/dbal 3.9.3 php-composer doctrine/deprecations 1.1.3 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer @@ -41,7 +41,7 @@ doctrine/lexer 3.0.1 php-composer dompdf/dompdf v3.0.0 php-composer dompdf/php-font-lib 1.0.0 php-composer dompdf/php-svg-lib 1.0.0 php-composer -dragonmantank/cron-expression v3.3.3 php-composer +dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.23.1 php-composer @@ -59,18 +59,18 @@ git-perl 2.45.2-r0 apk glib 2.80.5-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer -guzzlehttp/promises 2.0.3 php-composer +guzzlehttp/promises 2.0.4 php-composer guzzlehttp/psr7 2.7.0 php-composer guzzlehttp/uri-template v1.0.3 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.2.0 php-composer -intervention/image 3.8.0 php-composer +intervention/image 3.9.1 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.8 php-composer +larastan/larastan v2.9.10 php-composer laravel/framework v10.48.22 php-composer laravel/prompts v0.1.25 php-composer laravel/serializable-closure v1.3.5 php-composer @@ -78,9 +78,9 @@ laravel/socialite v5.16.0 php-composer laravel/tinker v2.10.0 php-composer league/commonmark 2.5.3 php-composer league/config v1.2.0 php-composer -league/flysystem 3.28.0 php-composer -league/flysystem-aws-s3-v3 3.28.0 php-composer -league/flysystem-local 3.28.0 php-composer +league/flysystem 3.29.1 php-composer +league/flysystem-aws-s3-v3 3.29.0 php-composer +league/flysystem-local 3.29.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.10.1 php-composer @@ -149,13 +149,13 @@ nano 8.0-r0 apk ncurses-terminfo-base 6.4_p20240420-r1 apk nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk -nette/schema v1.3.0 php-composer +nette/schema v1.3.2 php-composer nette/utils v4.0.5 php-composer nghttp2-libs 1.62.1-r0 apk nginx 1.26.2-r0 apk -nikic/php-parser v5.2.0 php-composer -nunomaduro/collision v7.10.0 php-composer -nunomaduro/termwind v1.15.1 php-composer +nikic/php-parser v5.3.1 php-composer +nunomaduro/collision v7.11.0 php-composer +nunomaduro/termwind v1.16.0 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.2-r1 apk @@ -198,13 +198,13 @@ php83-zip 8.3.13-r0 apk phpmyadmin/sql-parser 5.10.0 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer -phpstan/phpstan 1.12.5 php-composer +phpstan/phpstan 1.12.8 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.35 php-composer +phpunit/phpunit 10.5.38 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.2.2 php-composer @@ -225,12 +225,12 @@ ramsey/collection 2.0.0 php-composer ramsey/uuid 4.7.6 php-composer readline 8.2.10-r0 apk robrichards/xmlseclibs 3.1.1 php-composer -sabberworm/php-css-parser v8.6.0 php-composer +sabberworm/php-css-parser v8.7.0 php-composer scanelf 1.3.7-r2 apk sebastian/cli-parser 2.0.1 php-composer sebastian/code-unit 2.0.0 php-composer sebastian/code-unit-reverse-lookup 3.0.0 php-composer -sebastian/comparator 5.0.2 php-composer +sebastian/comparator 5.0.3 php-composer sebastian/complexity 3.2.0 php-composer sebastian/diff 5.1.1 php-composer sebastian/environment 6.1.0 php-composer @@ -255,17 +255,17 @@ ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r29 apk -symfony/console v6.4.12 php-composer -symfony/css-selector v6.4.8 php-composer +symfony/console v6.4.14 php-composer +symfony/css-selector v6.4.13 php-composer symfony/deprecation-contracts v3.5.0 php-composer -symfony/dom-crawler v6.4.12 php-composer -symfony/error-handler v6.4.10 php-composer -symfony/event-dispatcher v6.4.8 php-composer +symfony/dom-crawler v6.4.13 php-composer +symfony/error-handler v6.4.14 php-composer +symfony/event-dispatcher v6.4.13 php-composer symfony/event-dispatcher-contracts v3.5.0 php-composer -symfony/finder v6.4.11 php-composer -symfony/http-foundation v6.4.12 php-composer -symfony/http-kernel v6.4.12 php-composer -symfony/mime v6.4.12 php-composer +symfony/finder v6.4.13 php-composer +symfony/http-foundation v6.4.14 php-composer +symfony/http-kernel v6.4.14 php-composer +symfony/mime v6.4.13 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 @@ -274,14 +274,14 @@ 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 v6.4.12 php-composer -symfony/routing v6.4.12 php-composer +symfony/process v6.4.14 php-composer +symfony/routing v6.4.13 php-composer symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.12 php-composer -symfony/translation v6.4.12 php-composer +symfony/string v6.4.13 php-composer +symfony/translation v6.4.13 php-composer symfony/translation-contracts v3.5.0 php-composer -symfony/uid v6.4.12 php-composer -symfony/var-dumper v6.4.11 php-composer +symfony/uid v6.4.13 php-composer +symfony/var-dumper v6.4.14 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024b-r0 apk From 0bdb37bf4f7c00ed44a0620dc5fde41e9d59937f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Nov 2024 18:26:36 +0000 Subject: [PATCH 402/452] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 712bba9..9d47d02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -894,7 +894,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From a9d2ee5a888a08af76a8793b73585121129f573d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 11 Nov 2024 18:27:36 +0000 Subject: [PATCH 403/452] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 4 ++-- .github/workflows/package_trigger_scheduler.yml | 5 +++-- README.md | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fd5e806..9f23508 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -105,10 +105,10 @@ docker build \ -t linuxserver/bookstack:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 35c7083..805d4bb 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -70,13 +70,14 @@ jobs: if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then if [[ -n "${triggered_branches}" ]]; then NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bookstack/activity/ \n" + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" fi if [[ -n "${skipped_branches}" ]]; then NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" fi - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" echo "**** Notifying Discord ****" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for bookstack** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-bookstack/activity/"' \n"}], + "description": "**Package Check Build(s) for bookstack** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} fi diff --git a/README.md b/README.md index 2da64fd..af6291d 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ If you wish to use the extra functionality of BookStack such as email, Memcache, When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -324,10 +325,10 @@ docker build \ -t lscr.io/linuxserver/bookstack:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. From 47165fc43d3346ffc23350f04d926eb3f8fb77d8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 13 Nov 2024 12:57:23 +0000 Subject: [PATCH 404/452] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7534489..56d32a4 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ 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.325.4 php-composer +aws/aws-sdk-php 3.325.7 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer @@ -44,7 +44,7 @@ dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk -fakerphp/faker v1.23.1 php-composer +fakerphp/faker v1.24.0 php-composer filp/whoops 2.16.0 php-composer findutils 4.9.0-r5 apk firebase/php-jwt v6.10.1 php-composer @@ -70,10 +70,10 @@ intervention/image 3.9.1 php-composer itsgoingd/clockwork v5.2.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.10 php-composer -laravel/framework v10.48.22 php-composer +larastan/larastan v2.9.11 php-composer +laravel/framework v10.48.23 php-composer laravel/prompts v0.1.25 php-composer -laravel/serializable-closure v1.3.5 php-composer +laravel/serializable-closure v1.3.6 php-composer laravel/socialite v5.16.0 php-composer laravel/tinker v2.10.0 php-composer league/commonmark 2.5.3 php-composer @@ -140,11 +140,11 @@ masterminds/html5 2.9.0 php-composer memcached 1.6.27-r0 apk mkfontscale 1.2.2-r6 apk mockery/mockery 1.6.12 php-composer -monolog/monolog 3.7.0 php-composer +monolog/monolog 3.8.0 php-composer mtdowling/jmespath.php 2.8.0 php-composer musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk -myclabs/deep-copy 1.12.0 php-composer +myclabs/deep-copy 1.12.1 php-composer nano 8.0-r0 apk ncurses-terminfo-base 6.4_p20240420-r1 apk nesbot/carbon 2.72.5 php-composer @@ -195,10 +195,10 @@ php83-tokenizer 8.3.13-r0 apk php83-xml 8.3.13-r0 apk php83-xmlwriter 8.3.13-r0 apk php83-zip 8.3.13-r0 apk -phpmyadmin/sql-parser 5.10.0 php-composer +phpmyadmin/sql-parser 5.10.1 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer -phpstan/phpstan 1.12.8 php-composer +phpstan/phpstan 1.12.10 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer @@ -246,11 +246,11 @@ shadow 4.15.1-r0 apk skalibs 2.14.1.1-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.6.0 php-composer +socialiteproviders/manager v4.7.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.10.3 php-composer +squizlabs/php_codesniffer 3.11.0 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer From 04589bb8ae39be0f8ad972623c959e70324fa113 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Wed, 20 Nov 2024 20:31:19 +0000 Subject: [PATCH 405/452] Attempt to remove any and all ambiguity from the readme instructions. --- README.md | 14 +++++++------- readme-vars.yml | 14 +++++++------- .../s6-overlay/s6-rc.d/init-bookstack-config/run | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index af6291d..31e2760 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ The architectures supported by this image are: The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. -This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. +This application is dependent on a MariaDB database, be it one you already have or a new one. If you do not already have one, we provide an image here https://github.com/linuxserver/docker-mariadb. If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. @@ -95,9 +95,9 @@ docker exec -it bookstack php /app/www/artisan bookstack:update-url ${OLD_URL} $ ### Advanced Users (full control over the .env file) -If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. +If you wish to use the extra functionality of BookStack such as email, LDAP and so on you will need to set additional environment variables or make your own .env file with guidance from the BookStack documentation. -When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. +The container will copy an exemplary .env file to /config/www/.env on your host system for you to use. ## Usage @@ -159,14 +159,14 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 80` | will map the container's port 80 to port 6875 on the host | +| `-p 80` | http/s web interface. | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-e APP_URL=` | The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | -| `-e APP_KEY=` | Session encryption key. Can be generated with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey` | +| `-e APP_URL=` | The protocol, IP/URL, and port that your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com` | +| `-e APP_KEY=` | Session encryption key. You will need to generate this with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey` | | `-e DB_HOST=` | The database instance hostname | -| `-e DB_PORT=3306` | Database port (default `3306`) | +| `-e DB_PORT=3306` | Database port | | `-e DB_USERNAME=` | Database user | | `-e DB_PASSWORD=` | Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.) | | `-e DB_DATABASE=` | Database name | diff --git a/readme-vars.yml b/readme-vars.yml index 5c3f77d..812d4bb 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,17 +24,17 @@ param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_env: true param_env_vars: - - { env_var: "APP_URL", env_value: "", desc: "The IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - - { env_var: "APP_KEY", env_value: "", desc: "Session encryption key. Can be generated with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey`"} + - { env_var: "APP_URL", env_value: "", desc: "The protocol, IP/URL, and port that your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - { env_var: "APP_KEY", env_value: "", desc: "Session encryption key. You will need to generate this with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey`"} - { env_var: "DB_HOST", env_value: "", desc: "The database instance hostname" } - - { env_var: "DB_PORT", env_value: "3306", desc: "Database port (default `3306`)" } + - { env_var: "DB_PORT", env_value: "3306", desc: "Database port" } - { env_var: "DB_USERNAME", env_value: "", desc: "Database user" } - { env_var: "DB_PASSWORD", env_value: "", desc: "Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - { env_var: "DB_DATABASE", env_value: "", desc: "Database name" } param_usage_include_ports: true param_ports: - - { external_port: "6875", internal_port: "80", port_desc: "will map the container's port 80 to port 6875 on the host" } + - { external_port: "6875", internal_port: "80", port_desc: "http/s web interface." } opt_param_usage_include_env: true opt_param_env_vars: @@ -46,7 +46,7 @@ app_setup_block: | The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. - This application is dependent on a MySQL database be it one you already have or a new one. If you do not already have one, set up our MariaDB container here https://hub.docker.com/r/linuxserver/mariadb/. + This application is dependent on a MariaDB database, be it one you already have or a new one. If you do not already have one, we provide an image here https://github.com/linuxserver/docker-mariadb. If you intend to use this application behind a subfolder reverse proxy, such as our SWAG container or Traefik you will need to make sure that the `APP_URL` environment variable is set to your external domain, or it will not work. @@ -77,9 +77,9 @@ app_setup_block: | ### Advanced Users (full control over the .env file) - If you wish to use the extra functionality of BookStack such as email, Memcache, LDAP and so on you will need to make your own .env file with guidance from the BookStack documentation. + If you wish to use the extra functionality of BookStack such as email, LDAP and so on you will need to set additional environment variables or make your own .env file with guidance from the BookStack documentation. - When you create the container, do not set any arguments for any SQL settings. The container will copy an exemplary .env file to /config/www/.env on your host system for you to edit. + The container will copy an exemplary .env file to /config/www/.env on your host system for you to use. # changelog changelogs: diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 8278406..221ed35 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -47,8 +47,9 @@ fi # Check for app key if [[ -z ${APP_KEY} ]]; then if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /app/www/.env 2> /dev/null || grep -qE "APP_KEY=SomeRandomString" /app/www/.env 2> /dev/null; then - echo "An application key is missing, halting init!" + echo "The application key is missing, halting init!" echo "You can generate a key with: docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey" + echo "And apply it to the APP_KEY environment variable." sleep infinity fi fi From 241c57b7f946590ace9ae1405b2155f2d64ef4bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 25 Nov 2024 18:28:59 +0000 Subject: [PATCH 406/452] Bot Updating Package Versions --- package_versions.txt | 52 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 56d32a4..53e0fd3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.1 binary +composer 2.8.3 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk @@ -97,7 +97,7 @@ libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk libevent 2.1.12-r7 apk -libexpat 2.6.3-r0 apk +libexpat 2.6.4-r0 apk libffi 3.4.6-r0 apk libfontenc 1.1.8-r0 apk libgcc 13.2.1_git20240309-r0 apk @@ -168,33 +168,33 @@ perl-error 0.17029-r2 apk perl-git 2.45.2-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.13-r0 apk -php83-common 8.3.13-r0 apk -php83-ctype 8.3.13-r0 apk -php83-curl 8.3.13-r0 apk -php83-dom 8.3.13-r0 apk -php83-exif 8.3.13-r0 apk -php83-fileinfo 8.3.13-r0 apk -php83-fpm 8.3.13-r0 apk -php83-gd 8.3.13-r0 apk -php83-iconv 8.3.13-r0 apk -php83-ldap 8.3.13-r0 apk -php83-mbstring 8.3.13-r0 apk -php83-mysqlnd 8.3.13-r0 apk -php83-openssl 8.3.13-r0 apk -php83-pdo 8.3.13-r0 apk -php83-pdo_mysql 8.3.13-r0 apk +php83 8.3.14-r0 apk +php83-common 8.3.14-r0 apk +php83-ctype 8.3.14-r0 apk +php83-curl 8.3.14-r0 apk +php83-dom 8.3.14-r0 apk +php83-exif 8.3.14-r0 apk +php83-fileinfo 8.3.14-r0 apk +php83-fpm 8.3.14-r0 apk +php83-gd 8.3.14-r0 apk +php83-iconv 8.3.14-r0 apk +php83-ldap 8.3.14-r0 apk +php83-mbstring 8.3.14-r0 apk +php83-mysqlnd 8.3.14-r0 apk +php83-openssl 8.3.14-r0 apk +php83-pdo 8.3.14-r0 apk +php83-pdo_mysql 8.3.14-r0 apk php83-pecl-igbinary 3.2.15-r0 apk php83-pecl-memcached 3.3.0-r0 apk php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.13-r0 apk -php83-session 8.3.13-r0 apk -php83-simplexml 8.3.13-r0 apk -php83-sockets 8.3.13-r0 apk -php83-tokenizer 8.3.13-r0 apk -php83-xml 8.3.13-r0 apk -php83-xmlwriter 8.3.13-r0 apk -php83-zip 8.3.13-r0 apk +php83-phar 8.3.14-r0 apk +php83-session 8.3.14-r0 apk +php83-simplexml 8.3.14-r0 apk +php83-sockets 8.3.14-r0 apk +php83-tokenizer 8.3.14-r0 apk +php83-xml 8.3.14-r0 apk +php83-xmlwriter 8.3.14-r0 apk +php83-zip 8.3.14-r0 apk phpmyadmin/sql-parser 5.10.1 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer From f719a0c2f5f5f2e936374bb6179e62d055dc7b29 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Fri, 29 Nov 2024 14:38:43 +0000 Subject: [PATCH 407/452] Bot Updating Package Versions --- package_versions.txt | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 53e0fd3..238c28c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ 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.325.7 php-composer +aws/aws-sdk-php 3.331.0 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.26-r0 apk brick/math 0.12.1 php-composer @@ -44,10 +44,10 @@ dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk -fakerphp/faker v1.24.0 php-composer +fakerphp/faker v1.24.1 php-composer filp/whoops 2.16.0 php-composer findutils 4.9.0-r5 apk -firebase/php-jwt v6.10.1 php-composer +firebase/php-jwt v6.10.2 php-composer font-freefont 20120503-r4 apk fontconfig 2.15.0-r1 apk freetype 2.13.2-r0 apk @@ -67,13 +67,13 @@ icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.2.0 php-composer intervention/image 3.9.1 php-composer -itsgoingd/clockwork v5.2.2 php-composer +itsgoingd/clockwork v5.3.1 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.11 php-composer -laravel/framework v10.48.23 php-composer +larastan/larastan v2.9.12 php-composer +laravel/framework v10.48.25 php-composer laravel/prompts v0.1.25 php-composer -laravel/serializable-closure v1.3.6 php-composer +laravel/serializable-closure v1.3.7 php-composer laravel/socialite v5.16.0 php-composer laravel/tinker v2.10.0 php-composer league/commonmark 2.5.3 php-composer @@ -155,7 +155,7 @@ nghttp2-libs 1.62.1-r0 apk nginx 1.26.2-r0 apk nikic/php-parser v5.3.1 php-composer nunomaduro/collision v7.11.0 php-composer -nunomaduro/termwind v1.16.0 php-composer +nunomaduro/termwind v1.17.0 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.2-r1 apk @@ -198,7 +198,7 @@ php83-zip 8.3.14-r0 apk phpmyadmin/sql-parser 5.10.1 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer -phpstan/phpstan 1.12.10 php-composer +phpstan/phpstan 1.12.11 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer @@ -207,7 +207,7 @@ phpunit/php-timer 6.0.0 php-composer phpunit/phpunit 10.5.38 php-composer popt 1.19-r3 apk pragmarx/google2fa v8.0.3 php-composer -predis/predis v2.2.2 php-composer +predis/predis v2.3.0 php-composer procps-ng 4.0.4-r0 apk psr/cache 3.0.0 php-composer psr/clock 1.0.0 php-composer @@ -224,7 +224,7 @@ ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.0.0 php-composer ramsey/uuid 4.7.6 php-composer readline 8.2.10-r0 apk -robrichards/xmlseclibs 3.1.1 php-composer +robrichards/xmlseclibs 3.1.3 php-composer sabberworm/php-css-parser v8.7.0 php-composer scanelf 1.3.7-r2 apk sebastian/cli-parser 2.0.1 php-composer @@ -250,21 +250,21 @@ socialiteproviders/manager v4.7.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.11.0 php-composer +squizlabs/php_codesniffer 3.11.1 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.36.1-r29 apk -symfony/console v6.4.14 php-composer +symfony/console v6.4.15 php-composer symfony/css-selector v6.4.13 php-composer -symfony/deprecation-contracts v3.5.0 php-composer -symfony/dom-crawler v6.4.13 php-composer +symfony/deprecation-contracts v3.5.1 php-composer +symfony/dom-crawler v6.4.16 php-composer symfony/error-handler v6.4.14 php-composer symfony/event-dispatcher v6.4.13 php-composer -symfony/event-dispatcher-contracts v3.5.0 php-composer +symfony/event-dispatcher-contracts v3.5.1 php-composer symfony/finder v6.4.13 php-composer -symfony/http-foundation v6.4.14 php-composer -symfony/http-kernel v6.4.14 php-composer +symfony/http-foundation v6.4.16 php-composer +symfony/http-kernel v6.4.16 php-composer symfony/mime v6.4.13 php-composer symfony/polyfill-ctype v1.31.0 php-composer symfony/polyfill-intl-grapheme v1.31.0 php-composer @@ -274,20 +274,20 @@ 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 v6.4.14 php-composer -symfony/routing v6.4.13 php-composer -symfony/service-contracts v3.5.0 php-composer -symfony/string v6.4.13 php-composer +symfony/process v6.4.15 php-composer +symfony/routing v6.4.16 php-composer +symfony/service-contracts v3.5.1 php-composer +symfony/string v6.4.15 php-composer symfony/translation v6.4.13 php-composer -symfony/translation-contracts v3.5.0 php-composer +symfony/translation-contracts v3.5.1 php-composer symfony/uid v6.4.13 php-composer -symfony/var-dumper v6.4.14 php-composer +symfony/var-dumper v6.4.15 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer tzdata 2024b-r0 apk utmps-libs 0.1.2.2-r1 apk vlucas/phpdotenv v5.6.1 php-composer -voku/portable-ascii 2.0.1 php-composer +voku/portable-ascii 2.0.3 php-composer webmozart/assert 1.11.0 php-composer xz-libs 5.6.2-r0 apk zlib 1.3.1-r1 apk From a96801f3928cc3c852279869aeb38b82b8bc7ce8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 18:29:18 +0000 Subject: [PATCH 408/452] Bot Updating Templated Files --- Jenkinsfile | 268 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9d47d02..a951c43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } // Input to determine if this is a package check parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') } // Configuration for the variables used for this specific repo environment { @@ -201,6 +201,7 @@ pipeline { env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -225,6 +226,7 @@ pipeline { env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -249,6 +251,7 @@ pipeline { env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -345,6 +348,35 @@ pipeline { else echo "No templates to delete" fi + echo "Starting Stage 2.5 - Update init diagram" + if ! grep -q 'init_diagram:' readme-vars.yml; then + echo "Adding the key 'init_diagram' to readme-vars.yml" + sed -i '\\|^#.*changelog.*$|d' readme-vars.yml + sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml + fi + mkdir -p ${TEMPDIR}/d2 + docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest + ls -al ${TEMPDIR}/d2 + yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml + if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then + echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit." + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f master + cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml + git add readme-vars.yml + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Init diagram is unchanged" + fi echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} @@ -553,8 +585,40 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } // Build MultiArch Docker containers for push to LS Repo @@ -585,8 +649,40 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } stage('Build ARM64') { @@ -595,10 +691,6 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ @@ -614,18 +706,47 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry_backoff(5,5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } } sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : ''' + docker system prune -af --volumes || : + ''' } } } @@ -775,37 +896,23 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + ''' } } } @@ -816,57 +923,34 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [ "${CI}" == "false" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 - docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} - fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi + done + ''' } } } From 85e3b1a0a5bb3f11acbfaf201849e90cf58f814d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 18:30:44 +0000 Subject: [PATCH 409/452] Bot Updating Templated Files --- readme-vars.yml | 158 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 53 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 812d4bb..02047b7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -11,39 +11,33 @@ project_blurb: | Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com - # supported architectures available_architectures: - - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - + - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"} param_usage_include_env: true param_env_vars: - - { env_var: "APP_URL", env_value: "", desc: "The protocol, IP/URL, and port that your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} - - { env_var: "APP_KEY", env_value: "", desc: "Session encryption key. You will need to generate this with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey`"} - - { env_var: "DB_HOST", env_value: "", desc: "The database instance hostname" } - - { env_var: "DB_PORT", env_value: "3306", desc: "Database port" } - - { env_var: "DB_USERNAME", env_value: "", desc: "Database user" } - - { env_var: "DB_PASSWORD", env_value: "", desc: "Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)" } - - { env_var: "DB_DATABASE", env_value: "", desc: "Database name" } - + - {env_var: "APP_URL", env_value: "", desc: "The protocol, IP/URL, and port that your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`"} + - {env_var: "APP_KEY", env_value: "", desc: "Session encryption key. You will need to generate this with `docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey`"} + - {env_var: "DB_HOST", env_value: "", desc: "The database instance hostname"} + - {env_var: "DB_PORT", env_value: "3306", desc: "Database port"} + - {env_var: "DB_USERNAME", env_value: "", desc: "Database user"} + - {env_var: "DB_PASSWORD", env_value: "", desc: "Database password (minimum 4 characters & non-alphanumeric passwords must be properly escaped.)"} + - {env_var: "DB_DATABASE", env_value: "", desc: "Database name"} param_usage_include_ports: true param_ports: - - { external_port: "6875", internal_port: "80", port_desc: "http/s web interface." } - + - {external_port: "6875", internal_port: "80", port_desc: "http/s web interface."} opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)." } - + - {env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)."} # application setup block app_setup_block_enabled: true -app_setup_block: | - +app_setup_block: |2 The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. This application is dependent on a MariaDB database, be it one you already have or a new one. If you do not already have one, we provide an image here https://github.com/linuxserver/docker-mariadb. @@ -80,39 +74,97 @@ app_setup_block: | If you wish to use the extra functionality of BookStack such as email, LDAP and so on you will need to set additional environment variables or make your own .env file with guidance from the BookStack documentation. The container will copy an exemplary .env file to /config/www/.env on your host system for you to use. - +# init diagram +init_diagram: | + "bookstack:latest": { + docker-mods + base { + fix-attr +\nlegacy cont-init + } + docker-mods -> base + legacy-services + custom services + init-services -> legacy-services + init-services -> custom services + custom services -> legacy-services + legacy-services -> ci-service-check + init-migrations -> init-adduser + init-nginx-end -> init-bookstack-config + init-nginx-end -> init-config + init-os-end -> init-config + init-bookstack-config -> init-config-end + init-config -> init-config-end + init-os-end -> init-crontab-config + init-mods-end -> init-custom-files + base -> init-envfile + init-os-end -> init-folders + init-php -> init-keygen + base -> init-migrations + base -> init-mods + init-config-end -> init-mods + init-version-checks -> init-mods + init-mods -> init-mods-end + init-mods-package-install -> init-mods-end + init-mods -> init-mods-package-install + init-samples -> init-nginx + init-permissions -> init-nginx-end + base -> init-os-end + init-adduser -> init-os-end + init-envfile -> init-os-end + init-migrations -> init-os-end + init-keygen -> init-permissions + init-nginx -> init-php + init-folders -> init-samples + init-custom-files -> init-services + init-mods-end -> init-services + init-config-end -> init-version-checks + init-services -> svc-cron + svc-cron -> legacy-services + init-services -> svc-memcached + svc-memcached -> legacy-services + init-services -> svc-nginx + svc-nginx -> legacy-services + init-services -> svc-php-fpm + svc-php-fpm -> legacy-services + init-services -> svc-queue-worker + svc-queue-worker -> legacy-services + } + Base Images: { + "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20" + } + "bookstack:latest" <- Base Images # changelog changelogs: - - { date: "11.10.24:", desc: "Default to environment config over .env file config."} - - { date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} - - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - - { date: "31.10.23:", desc: "Further sanitize sed replace." } - - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } - - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - - { date: "01.03.23:", desc: "Add php iconv." } - - { date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - - { date: "16.01.23:", desc: "Wrap `.env` values in quotes." } - - { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." } - - { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." } - - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - - { date: "14.03.22:", desc: "Add symlinks for theme support." } - - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } - - { date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0." } - - { date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)." } - - { date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default." } - - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - - { date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes." } - - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - - { date: "14.06.19:", desc: "Add wkhtmltopdf to image for PDF rendering." } - - { date: "20.04.19:", desc: "Rebase to Alpine 3.9, add MySQL init logic." } - - { date: "22.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - - { date: "20.01.19:", desc: "Added php7-curl"} - - { date: "04.11.18:", desc: "Added php7-ldap"} - - { date: "15.10.18:", desc: "Changed functionality for advanced users"} - - { date: "08.10.18:", desc: "Advanced mode, symlink changes, sed fixing, docs updated, added some composer files"} - - { date: "23.09.28:", desc: "Updates pre-release"} - - { date: "02.07.18:", desc: "Initial Release." } + - {date: "11.10.24:", desc: "Default to environment config over .env file config."} + - {date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} + - {date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} + - {date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."} + - {date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} + - {date: "31.10.23:", desc: "Further sanitize sed replace."} + - {date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support."} + - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."} + - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."} + - {date: "01.03.23:", desc: "Add php iconv."} + - {date: "19.01.23:", desc: "Rebase to alpine 3.17 with php8.1."} + - {date: "16.01.23:", desc: "Wrap `.env` values in quotes."} + - {date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)."} + - {date: "21.12.22:", desc: "Update db info in .env file when env vars are updated."} + - {date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users."} + - {date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."} + - {date: "14.03.22:", desc: "Add symlinks for theme support."} + - {date: "11.07.21:", desc: "Rebase to Alpine 3.14."} + - {date: "12.01.21:", desc: "Remove unused requirement, as of release 0.31.0."} + - {date: "17.12.20:", desc: "Make APP_URL var required (upstream changes)."} + - {date: "17.09.20:", desc: "Rebase to alpine 3.12. Fix APP_URL setting. Bump php post max and upload max filesizes to 100MB by default."} + - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."} + - {date: "26.07.19:", desc: "Use old version of tidyhtml pending upstream fixes."} + - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."} + - {date: "14.06.19:", desc: "Add wkhtmltopdf to image for PDF rendering."} + - {date: "20.04.19:", desc: "Rebase to Alpine 3.9, add MySQL init logic."} + - {date: "22.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."} + - {date: "20.01.19:", desc: "Added php7-curl"} + - {date: "04.11.18:", desc: "Added php7-ldap"} + - {date: "15.10.18:", desc: "Changed functionality for advanced users"} + - {date: "08.10.18:", desc: "Advanced mode, symlink changes, sed fixing, docs updated, added some composer files"} + - {date: "23.09.28:", desc: "Updates pre-release"} + - {date: "02.07.18:", desc: "Initial Release."} From 3955a5ceab061eafd1b9e640f36192120e59a2ce Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 18:31:56 +0000 Subject: [PATCH 410/452] Bot Updating Templated Files --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 02047b7..208bd19 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -37,7 +37,7 @@ opt_param_env_vars: - {env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)."} # application setup block app_setup_block_enabled: true -app_setup_block: |2 +app_setup_block: | The default username is admin@admin.com with the password of **password**, access the container at http://<host ip>:6875. This application is dependent on a MariaDB database, be it one you already have or a new one. If you do not already have one, we provide an image here https://github.com/linuxserver/docker-mariadb. From b52e28a1a2bc0c5f5e586c21043b1eb130518e12 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 2 Dec 2024 18:34:35 +0000 Subject: [PATCH 411/452] Bot Updating Templated Files --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 31e2760..094722e 100644 --- a/README.md +++ b/README.md @@ -99,11 +99,13 @@ If you wish to use the extra functionality of BookStack such as email, LDAP and The container will copy an exemplary .env file to /config/www/.env on your host system for you to use. - ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. +>[!NOTE] +>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)) ```yaml @@ -159,7 +161,7 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 80` | http/s web interface. | +| `-p 6875:80` | http/s web interface. | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | From b704ebdd2534b2aee2e2a9aea5d44cf2b483d48a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 9 Dec 2024 18:30:53 +0000 Subject: [PATCH 412/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index a291b48..7845a91 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -43,16 +43,18 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbookstack%3Apull" \ | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.index.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}") + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") From 15092cd7680e69cf8e9f960f9db8ab4dcbfe8f26 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 18:29:47 +0000 Subject: [PATCH 413/452] Bot Updating Templated Files --- Jenkinsfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a951c43..07ca88e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -585,7 +585,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -614,7 +614,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -649,7 +651,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -678,7 +680,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -706,7 +710,7 @@ pipeline { --label \"org.opencontainers.image.title=Bookstack\" \ --label \"org.opencontainers.image.description=[Bookstack](https://github.com/BookStackApp/BookStack) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. Powered by SQL and including a Markdown editor for those who prefer it, BookStack is geared towards making documentation more of a pleasure than a chore. For more information on BookStack visit their website and check it out: https://www.bookstackapp.com \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -735,7 +739,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -978,7 +984,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From 10aca3f4214e856e47d87dc4dc2c86cde5b211dc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 18:32:26 +0000 Subject: [PATCH 414/452] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 33 ++++++++++++++----- .../workflows/package_trigger_scheduler.yml | 27 ++++++++++++--- 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 7845a91..012abdc 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,13 +48,30 @@ jobs: --header "Accept: application/vnd.oci.image.index.v1+json" \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/manifests/${tag}") - multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Accept: application/vnd.oci.image.manifest.v1+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # If there's a layer element it's a single-arch manifest so just get that digest + digest=$(jq -r '.config.digest' <<< "${multidigest}") + else + # Otherwise it's multi-arch or has manifest annotations + if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # Check for manifest annotations and delete if found + multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}") + fi + if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then + # If there's still more than one digest, it's multi-arch + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + else + # Otherwise it's single arch + multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}") + fi + if digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then + digest=$(jq -r '.config.digest' <<< "${digest}"); + fi + fi image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") @@ -92,7 +109,7 @@ jobs: 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 - if "${artifacts_found}" == "true" ]]; then + if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi response=$(curl -iX POST \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 805d4bb..7233671 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -27,9 +27,18 @@ jobs: fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/jenkins-vars.yml) - if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then + if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/Jenkinsfile >/dev/null 2>&1; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-bookstack/${br}/readme-vars.yml) + if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -37,7 +46,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`bookstack_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -49,6 +58,11 @@ jobs: response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-bookstack/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + if [[ -z "${response}" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Jenkins build could not be triggered. Skipping branch." + continue + fi echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 @@ -56,11 +70,14 @@ jobs: buildurl="${buildurl%$'\r'}" echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ + if ! curl -ifX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" + --data-urlencode "Submit=Submit"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Unable to change the Jenkins job description." + fi sleep 20 fi else From 9a88ade8e1062119b8579e3d43687867c218501c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 16 Dec 2024 18:38:51 +0000 Subject: [PATCH 415/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 238c28c..8ee0b84 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ alpine-keys 2.4-r1 apk alpine-release 3.20.3-r0 apk aom-libs 3.9.1-r0 apk apache2-utils 2.4.62-r0 apk -apk-tools 2.14.4-r0 apk +apk-tools 2.14.4-r1 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -23,12 +23,12 @@ ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.3 binary +composer 2.8.4 binary coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.1-r2 apk +curl 8.11.0-r2 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r1 apk dflydev/dot-access-data v3.0.3 php-composer @@ -92,7 +92,7 @@ libblkid 2.40.1-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r1 apk -libcurl 8.9.1-r2 apk +libcurl 8.11.0-r2 apk libdav1d 1.4.2-r0 apk libeconf 0.6.3-r0 apk libedit 20240517.3.1-r0 apk @@ -109,7 +109,7 @@ libldap 2.6.8-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r1 apk +libncursesw 6.4_p20240420-r2 apk libpcre2-16 10.43-r0 apk libpng 1.6.44-r0 apk libproc2 4.0.4-r0 apk @@ -146,7 +146,7 @@ musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk myclabs/deep-copy 1.12.1 php-composer nano 8.0-r0 apk -ncurses-terminfo-base 6.4_p20240420-r1 apk +ncurses-terminfo-base 6.4_p20240420-r2 apk nesbot/carbon 2.72.5 php-composer netcat-openbsd 1.226-r0 apk nette/schema v1.3.2 php-composer From 476e0463b11b63b7fdcfef99a3dfed142f96fc15 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 17 Dec 2024 17:55:20 +0000 Subject: [PATCH 416/452] Rebase to 3.21, support read-only operation --- Dockerfile | 13 +++++- Dockerfile.aarch64 | 13 +++++- README.md | 10 +++++ readme-vars.yml | 4 ++ .../s6-rc.d/init-bookstack-config/run | 42 +++---------------- 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index d97c5b6..ccf455a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 # set version label ARG BUILD_DATE @@ -47,6 +47,17 @@ RUN \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ + echo "**** create symlinks ****" && \ + rm -rf /app/www/themes && ln -s /config/www/themes /app/www/themes && \ + rm -rf /app/www/storage/uploads/files && ln -s /config/www/files /app/www/storage/uploads/files && \ + rm -rf /app/www/storage/uploads/images && ln -s /config/www/images /app/www/storage/uploads/images && \ + rm -rf /app/www/public/uploads && ln -s /config/www/uploads /app/www/public/uploads && \ + rm -rf /app/www/storage/backup && ln -s /config/backups /app/www/storage/backups && \ + rm -rf /app/www/storage/framework/cache && ln -s /config/www/framework/cache /app/www/storage/framework/cache && \ + rm -rf /app/www/storage/framework/sessions && ln -s /config/www/framework/sessions /app/www/storage/framework/sessions && \ + rm -rf /app/www/storage/framework/views && ln -s /config/www/framework/views /app/www/storage/framework/views && \ + rm -rf /app/www/storage/logs/laravel.log && ln -s /config/log/bookstack/laravel.log /app/www/storage/logs/laravel.log && \ + rm -rf /app/www/.env && ln -s /config/www/.env /app/www/.env && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5436878..ff634a2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 # set version label ARG BUILD_DATE @@ -47,6 +47,17 @@ RUN \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ + echo "**** create symlinks ****" && \ + rm -rf /app/www/themes && ln -s /config/www/themes /app/www/themes && \ + rm -rf /app/www/storage/uploads/files && ln -s /config/www/files /app/www/storage/uploads/files && \ + rm -rf /app/www/storage/uploads/images && ln -s /config/www/images /app/www/storage/uploads/images && \ + rm -rf /app/www/public/uploads && ln -s /config/www/uploads /app/www/public/uploads && \ + rm -rf /app/www/storage/backup && ln -s /config/backups /app/www/storage/backups && \ + rm -rf /app/www/storage/framework/cache && ln -s /config/www/framework/cache /app/www/storage/framework/cache && \ + rm -rf /app/www/storage/framework/sessions && ln -s /config/www/framework/sessions /app/www/storage/framework/sessions && \ + rm -rf /app/www/storage/framework/views && ln -s /config/www/framework/views /app/www/storage/framework/views && \ + rm -rf /app/www/storage/logs/laravel.log && ln -s /config/log/bookstack/laravel.log /app/www/storage/logs/laravel.log && \ + rm -rf /app/www/.env && ln -s /config/www/.env /app/www/.env && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/README.md b/README.md index 094722e..5121a77 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,14 @@ If you wish to use the extra functionality of BookStack such as email, LDAP and The container will copy an exemplary .env file to /config/www/.env on your host system for you to use. +## Read-Only Operation + +This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). + +### Caveats + +* `/tmp` must be mounted to tmpfs + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -174,6 +182,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e DB_DATABASE=` | Database name | | `-e QUEUE_CONNECTION=` | Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling). | | `-v /config` | Persistent config files | +| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | ## Environment variables from files (Docker secrets) @@ -337,6 +346,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **17.12.24:** - Rebase to Alpine 3.21. * **11.10.24:** - Default to environment config over .env file config. * **06.09.24:** - Add php-exif for reading image EXIF data. * **27.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. diff --git a/readme-vars.yml b/readme-vars.yml index 208bd19..0f45993 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -35,6 +35,9 @@ param_ports: opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "QUEUE_CONNECTION", env_value: "", desc: "Set to `database` to enable async actions like sending email or triggering webhooks. See [documentation](https://www.bookstackapp.com/docs/admin/email-webhooks/#async-action-handling)."} +readonly_supported: true +readonly_message: | + * `/tmp` must be mounted to tmpfs # application setup block app_setup_block_enabled: true app_setup_block: | @@ -135,6 +138,7 @@ init_diagram: | "bookstack:latest" <- Base Images # changelog changelogs: + - {date: "17.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "11.10.24:", desc: "Default to environment config over .env file config."} - {date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} - {date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index 221ed35..be6f7ca 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -4,49 +4,20 @@ # create directory structure mkdir -p \ /config/www/{uploads,files,images,themes} \ + /config/www/framework/{cache,sessions,views} \ /config/backups \ /config/log/bookstack +rm -rf /config/www/framework/{cache,sessions,views}/* + # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then cp /app/www/.env.example /config/www/.env fi -# create symlinks -symlinks=( - /app/www/themes - /app/www/storage/uploads/files - /app/www/storage/uploads/images - /app/www/public/uploads - /app/www/.env -) - -for i in "${symlinks[@]}"; do - if [[ -e "${i}" && ! -L "${i}" ]]; then - rm -rf "${i}" - fi - if [[ ! -L "${i}" ]]; then - ln -s /config/www/"$(basename "${i}")" "${i}" - fi -done - -if [[ -e "/app/www/storage/backups" && ! -L "/app/www/storage/backups" ]]; then - rm -rf "/app/www/storage/backups" -fi -if [[ ! -L "/app/www/storage/backups" ]]; then - ln -s "/config/backups" "/app/www/storage/backups" -fi - -if [[ -e "/app/www/storage/logs" && ! -L "/app/www/storage/logs" ]]; then - rm -rf "/app/www/storage/logs" -fi -if [[ ! -L "/app/www/storage/logs" ]]; then - ln -s "/config/log/bookstack" "/app/www/storage/logs" -fi - # Check for app key if [[ -z ${APP_KEY} ]]; then - if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /app/www/.env 2> /dev/null || grep -qE "APP_KEY=SomeRandomString" /app/www/.env 2> /dev/null; then + if ! grep -qE "APP_KEY=[0-9A-Za-z:+\/=]{1,}" /config/www/.env 2> /dev/null || grep -qE "APP_KEY=SomeRandomString" /config/www/.env 2> /dev/null; then echo "The application key is missing, halting init!" echo "You can generate a key with: docker run -it --rm --entrypoint /bin/bash lscr.io/linuxserver/bookstack:latest appkey" echo "And apply it to the APP_KEY environment variable." @@ -72,10 +43,10 @@ echo "Waiting for DB to be available" END=$((SECONDS + 30)) while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then - if [[ ! -f /dbwait.lock ]]; then + if [[ ! -f /run/dbwait.lock ]]; then sleep 5 fi - touch /dbwait.lock + touch /run/dbwait.lock break else sleep 1 @@ -87,5 +58,4 @@ php /app/www/artisan migrate --force # permissions lsiown -R abc:abc \ - /app/www/storage \ /config From fdf34906e595dcc0fdf6b265f6fbab81b07c6a7d Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Tue, 17 Dec 2024 17:58:35 +0000 Subject: [PATCH 417/452] Use /tmp as we need it anyway --- root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index be6f7ca..b8e03f0 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -43,10 +43,10 @@ echo "Waiting for DB to be available" END=$((SECONDS + 30)) while [[ ${SECONDS} -lt ${END} ]] && [[ -n "${DB_HOST+x}" ]]; do if [[ $(/usr/bin/nc -w1 "${DB_HOST}" "${DB_PORT}" | tr -d '\0') ]]; then - if [[ ! -f /run/dbwait.lock ]]; then + if [[ ! -f /tmp/dbwait.lock ]]; then sleep 5 fi - touch /run/dbwait.lock + touch /tmp/dbwait.lock break else sleep 1 From 5fd60b393b2d6515d0dea11e4edc45db4b770661 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Wed, 18 Dec 2024 15:45:06 +0000 Subject: [PATCH 418/452] Improve symlink creation --- Dockerfile | 14 ++++---------- Dockerfile.aarch64 | 14 ++++---------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccf455a..340c523 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,16 +48,10 @@ RUN \ composer install -d /app/www/ && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** create symlinks ****" && \ - rm -rf /app/www/themes && ln -s /config/www/themes /app/www/themes && \ - rm -rf /app/www/storage/uploads/files && ln -s /config/www/files /app/www/storage/uploads/files && \ - rm -rf /app/www/storage/uploads/images && ln -s /config/www/images /app/www/storage/uploads/images && \ - rm -rf /app/www/public/uploads && ln -s /config/www/uploads /app/www/public/uploads && \ - rm -rf /app/www/storage/backup && ln -s /config/backups /app/www/storage/backups && \ - rm -rf /app/www/storage/framework/cache && ln -s /config/www/framework/cache /app/www/storage/framework/cache && \ - rm -rf /app/www/storage/framework/sessions && ln -s /config/www/framework/sessions /app/www/storage/framework/sessions && \ - rm -rf /app/www/storage/framework/views && ln -s /config/www/framework/views /app/www/storage/framework/views && \ - rm -rf /app/www/storage/logs/laravel.log && ln -s /config/log/bookstack/laravel.log /app/www/storage/logs/laravel.log && \ - rm -rf /app/www/.env && ln -s /config/www/.env /app/www/.env && \ + /bin/bash -c \ + '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/backup 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' && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ff634a2..76bdeb1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -48,16 +48,10 @@ RUN \ composer install -d /app/www/ && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** create symlinks ****" && \ - rm -rf /app/www/themes && ln -s /config/www/themes /app/www/themes && \ - rm -rf /app/www/storage/uploads/files && ln -s /config/www/files /app/www/storage/uploads/files && \ - rm -rf /app/www/storage/uploads/images && ln -s /config/www/images /app/www/storage/uploads/images && \ - rm -rf /app/www/public/uploads && ln -s /config/www/uploads /app/www/public/uploads && \ - rm -rf /app/www/storage/backup && ln -s /config/backups /app/www/storage/backups && \ - rm -rf /app/www/storage/framework/cache && ln -s /config/www/framework/cache /app/www/storage/framework/cache && \ - rm -rf /app/www/storage/framework/sessions && ln -s /config/www/framework/sessions /app/www/storage/framework/sessions && \ - rm -rf /app/www/storage/framework/views && ln -s /config/www/framework/views /app/www/storage/framework/views && \ - rm -rf /app/www/storage/logs/laravel.log && ln -s /config/log/bookstack/laravel.log /app/www/storage/logs/laravel.log && \ - rm -rf /app/www/.env && ln -s /config/www/.env /app/www/.env && \ + /bin/bash -c \ + '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/backup 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' && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ From 15af88580511e4d94d7a59e791388575935afed3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 21 Dec 2024 13:31:47 +0000 Subject: [PATCH 419/452] Bot Updating Templated Files --- readme-vars.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index 0f45993..5f0a69e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -97,30 +97,25 @@ init_diagram: | init-os-end -> init-config init-bookstack-config -> init-config-end init-config -> init-config-end - init-os-end -> init-crontab-config + init-crontab-config -> init-config-end + init-config -> init-crontab-config init-mods-end -> init-custom-files base -> init-envfile init-os-end -> init-folders init-php -> init-keygen base -> init-migrations - base -> init-mods init-config-end -> init-mods - init-version-checks -> init-mods - init-mods -> init-mods-end init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install init-samples -> init-nginx - init-permissions -> init-nginx-end - base -> init-os-end + init-version-checks -> init-nginx-end init-adduser -> init-os-end init-envfile -> init-os-end - init-migrations -> init-os-end init-keygen -> init-permissions init-nginx -> init-php init-folders -> init-samples init-custom-files -> init-services - init-mods-end -> init-services - init-config-end -> init-version-checks + init-permissions -> init-version-checks init-services -> svc-cron svc-cron -> legacy-services init-services -> svc-memcached @@ -133,7 +128,7 @@ init_diagram: | svc-queue-worker -> legacy-services } Base Images: { - "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20" + "baseimage-alpine-nginx:3.21" <- "baseimage-alpine:3.21" } "bookstack:latest" <- Base Images # changelog From ee61205ece0633b1bfec1b70b5119656ecca00ad Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 21 Dec 2024 13:34:54 +0000 Subject: [PATCH 420/452] Bot Updating Package Versions --- package_versions.txt | 194 +++++++++++++++++++++---------------------- 1 file changed, 95 insertions(+), 99 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8ee0b84..1052374 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,26 +1,27 @@ NAME VERSION TYPE Hidden Input 1, 0, 0, 0 dotnet -alpine-baselayout 3.6.5-r0 apk -alpine-baselayout-data 3.6.5-r0 apk -alpine-keys 2.4-r1 apk -alpine-release 3.20.3-r0 apk -aom-libs 3.9.1-r0 apk +acl-libs 2.3.2-r1 apk +alpine-baselayout 3.6.8-r0 apk +alpine-baselayout-data 3.6.8-r0 apk +alpine-keys 2.5-r0 apk +alpine-release 3.21.0-r0 apk +aom-libs 3.11.0-r0 apk apache2-utils 2.4.62-r0 apk -apk-tools 2.14.4-r1 apk +apk-tools 2.14.6-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.331.0 php-composer bacon/bacon-qr-code v3.0.1 php-composer -bash 5.2.26-r0 apk +bash 5.2.37-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.36.1-r29 apk -busybox-binsh 1.36.1-r29 apk -c-ares 1.33.1-r0 apk -ca-certificates 20240705-r0 apk -ca-certificates-bundle 20240705-r0 apk +busybox 1.37.0-r9 apk +busybox-binsh 1.37.0-r9 apk +c-ares 1.34.3-r0 apk +ca-certificates 20241010-r0 apk +ca-certificates-bundle 20241010-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk composer 2.8.4 binary @@ -28,9 +29,9 @@ coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.11.0-r2 apk +curl 8.11.1-r0 apk dasprid/enum 1.0.6 php-composer -dbus-libs 1.14.10-r1 apk +dbus-libs 1.14.10-r4 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.9.3 php-composer @@ -46,17 +47,16 @@ egulias/email-validator 4.0.2 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer filp/whoops 2.16.0 php-composer -findutils 4.9.0-r5 apk +findutils 4.10.0-r0 apk firebase/php-jwt v6.10.2 php-composer font-freefont 20120503-r4 apk fontconfig 2.15.0-r1 apk -freetype 2.13.2-r0 apk +freetype 2.13.3-r0 apk fruitcake/php-cors v1.3.0 php-composer -gdbm 1.23-r1 apk -git 2.45.2-r0 apk -git-init-template 2.45.2-r0 apk -git-perl 2.45.2-r0 apk -glib 2.80.5-r0 apk +gdbm 1.24-r0 apk +git 2.47.1-r0 apk +git-init-template 2.47.1-r0 apk +glib 2.82.4-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer guzzlehttp/promises 2.0.4 php-composer @@ -85,116 +85,112 @@ league/html-to-markdown 5.1.1 php-composer league/mime-type-detection 1.16.0 php-composer league/oauth1-client v1.10.1 php-composer league/oauth2-client 2.7.0 php-composer -libacl 2.3.2-r0 apk -libattr 2.5.2-r0 apk +libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk -libblkid 2.40.1-r1 apk +libblkid 2.40.2-r4 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r1 apk -libcurl 8.11.0-r2 apk -libdav1d 1.4.2-r0 apk +libcrypto3 3.3.2-r4 apk +libcurl 8.11.1-r0 apk +libdav1d 1.5.0-r0 apk libeconf 0.6.3-r0 apk -libedit 20240517.3.1-r0 apk +libedit 20240808.3.1-r0 apk libevent 2.1.12-r7 apk libexpat 2.6.4-r0 apk libffi 3.4.6-r0 apk libfontenc 1.1.8-r0 apk -libgcc 13.2.1_git20240309-r0 apk +libgcc 14.2.0-r4 apk libice 1.1.1-r6 apk libidn2 2.3.7-r0 apk libintl 0.22.5-r0 apk -libjpeg-turbo 3.0.3-r0 apk +libjpeg-turbo 3.0.4-r0 apk libldap 2.6.8-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.40.1-r1 apk -libncursesw 6.4_p20240420-r2 apk +libmount 2.40.2-r4 apk +libncursesw 6.5_p20241006-r3 apk libpcre2-16 10.43-r0 apk libpng 1.6.44-r0 apk -libproc2 4.0.4-r0 apk -libpsl 0.21.5-r1 apk -libsasl 2.1.28-r6 apk +libproc2 4.0.4-r2 apk +libpsl 0.21.5-r3 apk +libsasl 2.1.28-r8 apk libseccomp 2.5.5-r1 apk -libsharpyuv 1.3.2-r0 apk +libsharpyuv 1.4.0-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.2-r1 apk -libstdc++ 13.2.1_git20240309-r0 apk +libssl3 3.3.2-r4 apk +libstdc++ 14.2.0-r4 apk libunistring 1.2-r0 apk -libuuid 2.40.1-r1 apk -libwebp 1.3.2-r0 apk -libx11 1.8.9-r1 apk +libuuid 2.40.2-r4 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 libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.12.7-r0 apk +libxml2 2.13.4-r3 apk libxpm 3.5.17-r0 apk -libxt 1.3.0-r5 apk -libzip 1.10.1-r0 apk -linux-pam 1.6.0-r0 apk +libxt 1.3.1-r0 apk +libzip 1.11.2-r0 apk +linux-pam 1.6.1-r1 apk logrotate 3.21.0-r1 apk -mariadb-client 10.11.10-r0 apk -mariadb-common 10.11.10-r0 apk +mariadb-client 11.4.4-r1 apk +mariadb-common 11.4.4-r1 apk masterminds/html5 2.9.0 php-composer -memcached 1.6.27-r0 apk -mkfontscale 1.2.2-r6 apk +memcached 1.6.32-r0 apk +mkfontscale 1.2.3-r1 apk mockery/mockery 1.6.12 php-composer monolog/monolog 3.8.0 php-composer mtdowling/jmespath.php 2.8.0 php-composer -musl 1.2.5-r0 apk -musl-utils 1.2.5-r0 apk +musl 1.2.5-r8 apk +musl-utils 1.2.5-r8 apk myclabs/deep-copy 1.12.1 php-composer -nano 8.0-r0 apk -ncurses-terminfo-base 6.4_p20240420-r2 apk +nano 8.2-r0 apk +ncurses-terminfo-base 6.5_p20241006-r3 apk nesbot/carbon 2.72.5 php-composer -netcat-openbsd 1.226-r0 apk +netcat-openbsd 1.226.1.1-r0 apk nette/schema v1.3.2 php-composer nette/utils v4.0.5 php-composer -nghttp2-libs 1.62.1-r0 apk -nginx 1.26.2-r0 apk +nghttp2-libs 1.64.0-r0 apk +nginx 1.26.2-r3 apk nikic/php-parser v5.3.1 php-composer nunomaduro/collision v7.11.0 php-composer nunomaduro/termwind v1.17.0 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.2-r1 apk +openssl 3.3.2-r4 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 -perl 5.38.2-r0 apk -perl-error 0.17029-r2 apk -perl-git 2.45.2-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.14-r0 apk -php83-common 8.3.14-r0 apk -php83-ctype 8.3.14-r0 apk -php83-curl 8.3.14-r0 apk -php83-dom 8.3.14-r0 apk -php83-exif 8.3.14-r0 apk -php83-fileinfo 8.3.14-r0 apk -php83-fpm 8.3.14-r0 apk -php83-gd 8.3.14-r0 apk -php83-iconv 8.3.14-r0 apk -php83-ldap 8.3.14-r0 apk -php83-mbstring 8.3.14-r0 apk -php83-mysqlnd 8.3.14-r0 apk -php83-openssl 8.3.14-r0 apk -php83-pdo 8.3.14-r0 apk -php83-pdo_mysql 8.3.14-r0 apk -php83-pecl-igbinary 3.2.15-r0 apk +php83 8.3.15-r0 apk +php83-common 8.3.15-r0 apk +php83-ctype 8.3.15-r0 apk +php83-curl 8.3.15-r0 apk +php83-dom 8.3.15-r0 apk +php83-exif 8.3.15-r0 apk +php83-fileinfo 8.3.15-r0 apk +php83-fpm 8.3.15-r0 apk +php83-gd 8.3.15-r0 apk +php83-iconv 8.3.15-r0 apk +php83-ldap 8.3.15-r0 apk +php83-mbstring 8.3.15-r0 apk +php83-mysqlnd 8.3.15-r0 apk +php83-openssl 8.3.15-r0 apk +php83-pdo 8.3.15-r0 apk +php83-pdo_mysql 8.3.15-r0 apk +php83-pecl-igbinary 3.2.16-r0 apk php83-pecl-memcached 3.3.0-r0 apk -php83-pecl-msgpack 2.2.0-r2 apk -php83-phar 8.3.14-r0 apk -php83-session 8.3.14-r0 apk -php83-simplexml 8.3.14-r0 apk -php83-sockets 8.3.14-r0 apk -php83-tokenizer 8.3.14-r0 apk -php83-xml 8.3.14-r0 apk -php83-xmlwriter 8.3.14-r0 apk -php83-zip 8.3.14-r0 apk +php83-pecl-msgpack 3.0.0-r0 apk +php83-phar 8.3.15-r0 apk +php83-session 8.3.15-r0 apk +php83-simplexml 8.3.15-r0 apk +php83-sockets 8.3.15-r0 apk +php83-tokenizer 8.3.15-r0 apk +php83-xml 8.3.15-r0 apk +php83-xmlwriter 8.3.15-r0 apk +php83-zip 8.3.15-r0 apk phpmyadmin/sql-parser 5.10.1 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.42 php-composer @@ -205,10 +201,10 @@ phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer phpunit/phpunit 10.5.38 php-composer -popt 1.19-r3 apk +popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.3.0 php-composer -procps-ng 4.0.4-r0 apk +procps-ng 4.0.4-r2 apk psr/cache 3.0.0 php-composer psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer @@ -219,14 +215,14 @@ 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.4 php-composer -qt5-qtbase 5.15.10_git20230714-r2 apk +qt5-qtbase 5.15.10_git20230714-r3 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.0.0 php-composer ramsey/uuid 4.7.6 php-composer -readline 8.2.10-r0 apk +readline 8.2.13-r0 apk robrichards/xmlseclibs 3.1.3 php-composer sabberworm/php-css-parser v8.7.0 php-composer -scanelf 1.3.7-r2 apk +scanelf 1.3.8-r1 apk sebastian/cli-parser 2.0.1 php-composer sebastian/code-unit 2.0.0 php-composer sebastian/code-unit-reverse-lookup 3.0.0 php-composer @@ -242,8 +238,8 @@ sebastian/object-reflector 3.0.0 php-composer sebastian/recursion-context 5.0.0 php-composer sebastian/type 4.0.0 php-composer sebastian/version 4.0.1 php-composer -shadow 4.15.1-r0 apk -skalibs 2.14.1.1-r0 apk +shadow 4.16.0-r1 apk +skalibs-libs 2.14.3.0-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer socialiteproviders/manager v4.7.0 php-composer @@ -254,7 +250,7 @@ squizlabs/php_codesniffer 3.11.1 php-composer ssddanbrown/asserthtml v3.0.0 php-composer ssddanbrown/htmldiff v1.0.3 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer -ssl_client 1.36.1-r29 apk +ssl_client 1.37.0-r9 apk symfony/console v6.4.15 php-composer symfony/css-selector v6.4.13 php-composer symfony/deprecation-contracts v3.5.1 php-composer @@ -284,11 +280,11 @@ symfony/uid v6.4.13 php-composer symfony/var-dumper v6.4.15 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.2.7 php-composer -tzdata 2024b-r0 apk -utmps-libs 0.1.2.2-r1 apk +tzdata 2024b-r1 apk +utmps-libs 0.1.2.3-r2 apk vlucas/phpdotenv v5.6.1 php-composer voku/portable-ascii 2.0.3 php-composer webmozart/assert 1.11.0 php-composer -xz-libs 5.6.2-r0 apk -zlib 1.3.1-r1 apk -zstd-libs 1.5.6-r0 apk +xz-libs 5.6.3-r0 apk +zlib 1.3.1-r2 apk +zstd-libs 1.5.6-r1 apk From d283e53018dc6e56cb94bf0b10c184e40d87f28d Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sun, 22 Dec 2024 21:59:37 +0000 Subject: [PATCH 421/452] Fix appkey gen with new symlinks --- root/appkey | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/root/appkey b/root/appkey index 2e689f6..684439f 100755 --- a/root/appkey +++ b/root/appkey @@ -1,3 +1,9 @@ #!/bin/bash +mkdir -p \ + /config/www/framework/{cache,sessions,views} \ + /config/log/bookstack + +touch /config/log/bookstack/laravel.log + php /app/www/artisan key:generate --show From c705a81c1ca646ecec001517945258b3e77f6b2f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 23 Dec 2024 12:56:46 +0000 Subject: [PATCH 422/452] Bot Updating Package Versions --- package_versions.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1052374..539a20b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ 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.331.0 php-composer +aws/aws-sdk-php 3.336.2 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.1 php-composer @@ -35,12 +35,12 @@ dbus-libs 1.14.10-r4 apk dflydev/dot-access-data v3.0.3 php-composer doctrine/cache 2.2.0 php-composer doctrine/dbal 3.9.3 php-composer -doctrine/deprecations 1.1.3 php-composer +doctrine/deprecations 1.1.4 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer -dompdf/dompdf v3.0.0 php-composer -dompdf/php-font-lib 1.0.0 php-composer +dompdf/dompdf v3.0.1 php-composer +dompdf/php-font-lib 1.0.1 php-composer dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.2 php-composer @@ -66,25 +66,25 @@ hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.2.0 php-composer -intervention/image 3.9.1 php-composer -itsgoingd/clockwork v5.3.1 php-composer +intervention/image 3.10.0 php-composer +itsgoingd/clockwork v5.3.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer larastan/larastan v2.9.12 php-composer laravel/framework v10.48.25 php-composer laravel/prompts v0.1.25 php-composer laravel/serializable-closure v1.3.7 php-composer -laravel/socialite v5.16.0 php-composer +laravel/socialite v5.16.1 php-composer laravel/tinker v2.10.0 php-composer -league/commonmark 2.5.3 php-composer +league/commonmark 2.6.0 php-composer league/config v1.2.0 php-composer league/flysystem 3.29.1 php-composer league/flysystem-aws-s3-v3 3.29.0 php-composer league/flysystem-local 3.29.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.10.1 php-composer -league/oauth2-client 2.7.0 php-composer +league/oauth1-client v1.11.0 php-composer +league/oauth2-client 2.8.0 php-composer libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk libblkid 2.40.2-r4 apk @@ -139,7 +139,7 @@ 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.8.0 php-composer +monolog/monolog 3.8.1 php-composer mtdowling/jmespath.php 2.8.0 php-composer musl 1.2.5-r8 apk musl-utils 1.2.5-r8 apk @@ -191,16 +191,16 @@ php83-tokenizer 8.3.15-r0 apk php83-xml 8.3.15-r0 apk php83-xmlwriter 8.3.15-r0 apk php83-zip 8.3.15-r0 apk -phpmyadmin/sql-parser 5.10.1 php-composer +phpmyadmin/sql-parser 5.10.2 php-composer phpoption/phpoption 1.9.3 php-composer -phpseclib/phpseclib 3.0.42 php-composer -phpstan/phpstan 1.12.11 php-composer +phpseclib/phpseclib 3.0.43 php-composer +phpstan/phpstan 1.12.13 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer phpunit/php-text-template 3.0.1 php-composer phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.38 php-composer +phpunit/phpunit 10.5.40 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.3.0 php-composer @@ -214,7 +214,7 @@ 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.4 php-composer +psy/psysh v0.12.7 php-composer qt5-qtbase 5.15.10_git20230714-r3 apk ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 2.0.0 php-composer @@ -246,9 +246,9 @@ socialiteproviders/manager v4.7.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.11.1 php-composer +squizlabs/php_codesniffer 3.11.2 php-composer ssddanbrown/asserthtml v3.0.0 php-composer -ssddanbrown/htmldiff v1.0.3 php-composer +ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.37.0-r9 apk symfony/console v6.4.15 php-composer From 72f406373b8724709d1321307ba5097ef9b7f2c1 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sat, 4 Jan 2025 22:28:25 +0000 Subject: [PATCH 423/452] Add php83-opcache --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + readme-vars.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 340c523..42096b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ RUN \ php83-gd \ php83-ldap \ php83-mysqlnd \ + php83-opcache \ php83-pdo_mysql \ php83-pecl-memcached \ php83-tokenizer \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 76bdeb1..6243d04 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -22,6 +22,7 @@ RUN \ php83-gd \ php83-ldap \ php83-mysqlnd \ + php83-opcache \ php83-pdo_mysql \ php83-pecl-memcached \ php83-tokenizer \ diff --git a/readme-vars.yml b/readme-vars.yml index 5f0a69e..fdd3916 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -133,6 +133,7 @@ init_diagram: | "bookstack:latest" <- Base Images # changelog changelogs: + - {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."} - {date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."} From 32a45a9d613c26624a7a3393887d8ca0eea4772c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 4 Jan 2025 23:31:05 +0000 Subject: [PATCH 424/452] Bot Updating Package Versions --- package_versions.txt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 539a20b..d1ea886 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ 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.336.2 php-composer +aws/aws-sdk-php 3.336.8 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.1 php-composer @@ -39,11 +39,11 @@ doctrine/deprecations 1.1.4 php-composer doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer -dompdf/dompdf v3.0.1 php-composer +dompdf/dompdf v3.0.2 php-composer dompdf/php-font-lib 1.0.1 php-composer dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer -egulias/email-validator 4.0.2 php-composer +egulias/email-validator 4.0.3 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer filp/whoops 2.16.0 php-composer @@ -66,7 +66,7 @@ hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.2.0 php-composer -intervention/image 3.10.0 php-composer +intervention/image 3.10.2 php-composer itsgoingd/clockwork v5.3.2 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.0 php-composer @@ -76,7 +76,7 @@ laravel/prompts v0.1.25 php-composer laravel/serializable-closure v1.3.7 php-composer laravel/socialite v5.16.1 php-composer laravel/tinker v2.10.0 php-composer -league/commonmark 2.6.0 php-composer +league/commonmark 2.6.1 php-composer league/config v1.2.0 php-composer league/flysystem 3.29.1 php-composer league/flysystem-aws-s3-v3 3.29.0 php-composer @@ -146,13 +146,13 @@ musl-utils 1.2.5-r8 apk myclabs/deep-copy 1.12.1 php-composer nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk -nesbot/carbon 2.72.5 php-composer +nesbot/carbon 2.72.6 php-composer netcat-openbsd 1.226.1.1-r0 apk nette/schema v1.3.2 php-composer nette/utils v4.0.5 php-composer nghttp2-libs 1.64.0-r0 apk -nginx 1.26.2-r3 apk -nikic/php-parser v5.3.1 php-composer +nginx 1.26.2-r4 apk +nikic/php-parser v5.4.0 php-composer nunomaduro/collision v7.11.0 php-composer nunomaduro/termwind v1.17.0 php-composer onelogin/php-saml 4.2.0 php-composer @@ -194,7 +194,7 @@ php83-zip 8.3.15-r0 apk phpmyadmin/sql-parser 5.10.2 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 1.12.13 php-composer +phpstan/phpstan 1.12.14 php-composer phpunit/php-code-coverage 10.1.16 php-composer phpunit/php-file-iterator 4.1.0 php-composer phpunit/php-invoker 4.0.0 php-composer @@ -242,26 +242,26 @@ shadow 4.16.0-r1 apk skalibs-libs 2.14.3.0-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.7.0 php-composer +socialiteproviders/manager v4.8.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer squizlabs/php_codesniffer 3.11.2 php-composer -ssddanbrown/asserthtml v3.0.0 php-composer +ssddanbrown/asserthtml v3.0.1 php-composer ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer ssl_client 1.37.0-r9 apk -symfony/console v6.4.15 php-composer +symfony/console v6.4.17 php-composer symfony/css-selector v6.4.13 php-composer symfony/deprecation-contracts v3.5.1 php-composer symfony/dom-crawler v6.4.16 php-composer -symfony/error-handler v6.4.14 php-composer +symfony/error-handler v6.4.17 php-composer symfony/event-dispatcher v6.4.13 php-composer symfony/event-dispatcher-contracts v3.5.1 php-composer -symfony/finder v6.4.13 php-composer +symfony/finder v6.4.17 php-composer symfony/http-foundation v6.4.16 php-composer -symfony/http-kernel v6.4.16 php-composer -symfony/mime v6.4.13 php-composer +symfony/http-kernel v6.4.17 php-composer +symfony/mime v6.4.17 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 @@ -279,7 +279,7 @@ symfony/translation-contracts v3.5.1 php-composer symfony/uid v6.4.13 php-composer symfony/var-dumper v6.4.15 php-composer theseer/tokenizer 1.2.3 php-composer -tijsverkoyen/css-to-inline-styles v2.2.7 php-composer +tijsverkoyen/css-to-inline-styles v2.3.0 php-composer tzdata 2024b-r1 apk utmps-libs 0.1.2.3-r2 apk vlucas/phpdotenv v5.6.1 php-composer @@ -287,4 +287,4 @@ voku/portable-ascii 2.0.3 php-composer webmozart/assert 1.11.0 php-composer xz-libs 5.6.3-r0 apk zlib 1.3.1-r2 apk -zstd-libs 1.5.6-r1 apk +zstd-libs 1.5.6-r2 apk From 29778a53214ddfcd91c6c90f7bd25dbff5e48e51 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 5 Jan 2025 10:06:14 +0000 Subject: [PATCH 425/452] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5121a77..b1d25b0 100644 --- a/README.md +++ b/README.md @@ -346,6 +346,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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. * **06.09.24:** - Add php-exif for reading image EXIF data. From 4efb651e21c594c3809b63e4588c17425f282dff Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 5 Jan 2025 10:10:52 +0000 Subject: [PATCH 426/452] Bot Updating Package Versions --- package_versions.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d1ea886..38ea21a 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,8 +1,8 @@ NAME VERSION TYPE Hidden Input 1, 0, 0, 0 dotnet acl-libs 2.3.2-r1 apk -alpine-baselayout 3.6.8-r0 apk -alpine-baselayout-data 3.6.8-r0 apk +alpine-baselayout 3.6.8-r1 apk +alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk alpine-release 3.21.0-r0 apk aom-libs 3.11.0-r0 apk @@ -20,8 +20,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r9 apk busybox-binsh 1.37.0-r9 apk c-ares 1.34.3-r0 apk -ca-certificates 20241010-r0 apk -ca-certificates-bundle 20241010-r0 apk +ca-certificates 20241121-r0 apk +ca-certificates-bundle 20241121-r0 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk composer 2.8.4 binary @@ -177,6 +177,7 @@ php83-iconv 8.3.15-r0 apk php83-ldap 8.3.15-r0 apk php83-mbstring 8.3.15-r0 apk php83-mysqlnd 8.3.15-r0 apk +php83-opcache 8.3.15-r0 apk php83-openssl 8.3.15-r0 apk php83-pdo 8.3.15-r0 apk php83-pdo_mysql 8.3.15-r0 apk From 17961c4c24a8ab2afc0e6e8bb74f58b1c6edaaef Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Wed, 15 Jan 2025 10:04:46 +0000 Subject: [PATCH 427/452] Only clear cache, sessions, views on container update --- root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index b8e03f0..01ba342 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -8,7 +8,9 @@ mkdir -p \ /config/backups \ /config/log/bookstack -rm -rf /config/www/framework/{cache,sessions,views}/* +if [[ ! -f /tmp/dbwait.lock ]];then + rm -rf /config/www/framework/{cache,sessions,views}/* +fi # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then From 9be39e5c49c3ba5e17ba3e8a4f05f590027147e2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 15 Jan 2025 14:00:27 +0000 Subject: [PATCH 428/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 38ea21a..e56266f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -87,7 +87,7 @@ league/oauth1-client v1.11.0 php-composer league/oauth2-client 2.8.0 php-composer libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk -libblkid 2.40.2-r4 apk +libblkid 2.40.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r4 apk @@ -107,7 +107,7 @@ libjpeg-turbo 3.0.4-r0 apk libldap 2.6.8-r0 apk libmd 1.1.0-r0 apk libmemcached-libs 1.1.4-r1 apk -libmount 2.40.2-r4 apk +libmount 2.40.4-r0 apk libncursesw 6.5_p20241006-r3 apk libpcre2-16 10.43-r0 apk libpng 1.6.44-r0 apk From ef5d337e4dda15e2e72f6b6bb3e9f85b2d667bfb Mon Sep 17 00:00:00 2001 From: quietsy <github@qtsy.cc> Date: Mon, 20 Jan 2025 17:21:03 +0200 Subject: [PATCH 429/452] Add categories to readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index fdd3916..cebfc8d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -5,6 +5,7 @@ project_name: bookstack project_url: "https://github.com/BookStackApp/BookStack" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bookstack-logo.png" project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_categories: "Content Management" project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a free and open source Wiki designed for creating beautiful documentation. Featuring a simple, but powerful WYSIWYG editor it allows for teams to create detailed and useful documentation with ease. From dcb27aab58319ff4d44b7119c5e584bc95b238b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 20 Jan 2025 18:27:33 +0000 Subject: [PATCH 430/452] Bot Updating Package Versions --- package_versions.txt | 76 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e56266f..48ea85c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.0-r0 apk +alpine-release 3.21.2-r0 apk aom-libs 3.11.0-r0 apk apache2-utils 2.4.62-r0 apk apk-tools 2.14.6-r2 apk @@ -17,18 +17,18 @@ bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.1 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r9 apk -busybox-binsh 1.37.0-r9 apk +busybox 1.37.0-r12 apk +busybox-binsh 1.37.0-r12 apk c-ares 1.34.3-r0 apk -ca-certificates 20241121-r0 apk -ca-certificates-bundle 20241121-r0 apk +ca-certificates 20241121-r1 apk +ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk composer 2.8.4 binary -coreutils 9.5-r1 apk -coreutils-env 9.5-r1 apk -coreutils-fmt 9.5-r1 apk -coreutils-sha512sum 9.5-r1 apk +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.11.1-r0 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r4 apk @@ -54,8 +54,8 @@ fontconfig 2.15.0-r1 apk freetype 2.13.3-r0 apk fruitcake/php-cors v1.3.0 php-composer gdbm 1.24-r0 apk -git 2.47.1-r0 apk -git-init-template 2.47.1-r0 apk +git 2.47.2-r0 apk +git-init-template 2.47.2-r0 apk glib 2.82.4-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer @@ -120,7 +120,7 @@ libsm 1.2.4-r4 apk libssl3 3.3.2-r4 apk libstdc++ 14.2.0-r4 apk libunistring 1.2-r0 apk -libuuid 2.40.2-r4 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 @@ -164,34 +164,34 @@ pcre 8.45-r3 apk pcre2 10.43-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.15-r0 apk -php83-common 8.3.15-r0 apk -php83-ctype 8.3.15-r0 apk -php83-curl 8.3.15-r0 apk -php83-dom 8.3.15-r0 apk -php83-exif 8.3.15-r0 apk -php83-fileinfo 8.3.15-r0 apk -php83-fpm 8.3.15-r0 apk -php83-gd 8.3.15-r0 apk -php83-iconv 8.3.15-r0 apk -php83-ldap 8.3.15-r0 apk -php83-mbstring 8.3.15-r0 apk -php83-mysqlnd 8.3.15-r0 apk -php83-opcache 8.3.15-r0 apk -php83-openssl 8.3.15-r0 apk -php83-pdo 8.3.15-r0 apk -php83-pdo_mysql 8.3.15-r0 apk +php83 8.3.16-r0 apk +php83-common 8.3.16-r0 apk +php83-ctype 8.3.16-r0 apk +php83-curl 8.3.16-r0 apk +php83-dom 8.3.16-r0 apk +php83-exif 8.3.16-r0 apk +php83-fileinfo 8.3.16-r0 apk +php83-fpm 8.3.16-r0 apk +php83-gd 8.3.16-r0 apk +php83-iconv 8.3.16-r0 apk +php83-ldap 8.3.16-r0 apk +php83-mbstring 8.3.16-r0 apk +php83-mysqlnd 8.3.16-r0 apk +php83-opcache 8.3.16-r0 apk +php83-openssl 8.3.16-r0 apk +php83-pdo 8.3.16-r0 apk +php83-pdo_mysql 8.3.16-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.15-r0 apk -php83-session 8.3.15-r0 apk -php83-simplexml 8.3.15-r0 apk -php83-sockets 8.3.15-r0 apk -php83-tokenizer 8.3.15-r0 apk -php83-xml 8.3.15-r0 apk -php83-xmlwriter 8.3.15-r0 apk -php83-zip 8.3.15-r0 apk +php83-phar 8.3.16-r0 apk +php83-session 8.3.16-r0 apk +php83-simplexml 8.3.16-r0 apk +php83-sockets 8.3.16-r0 apk +php83-tokenizer 8.3.16-r0 apk +php83-xml 8.3.16-r0 apk +php83-xmlwriter 8.3.16-r0 apk +php83-zip 8.3.16-r0 apk phpmyadmin/sql-parser 5.10.2 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer @@ -251,7 +251,7 @@ squizlabs/php_codesniffer 3.11.2 php-composer ssddanbrown/asserthtml v3.0.1 php-composer ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 6.4.x-dev php-composer -ssl_client 1.37.0-r9 apk +ssl_client 1.37.0-r12 apk symfony/console v6.4.17 php-composer symfony/css-selector v6.4.13 php-composer symfony/deprecation-contracts v3.5.1 php-composer From a31d51a1cd342707580662df5ce154e0ac308e0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 22 Jan 2025 00:20:52 +0000 Subject: [PATCH 431/452] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 48ea85c..914d363 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 2.1.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.4 binary +composer 2.8.5 binary coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk From 30ec902a3ac30e95e24757d2e8db999c0e6b4f88 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Feb 2025 18:28:39 +0000 Subject: [PATCH 432/452] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 07ca88e..86086e1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,11 +59,21 @@ pipeline { steps{ echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash - containers=$(docker ps -aq) + echo "Pruning builder" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : ''' + docker system prune -f --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -1162,12 +1172,21 @@ EOF } cleanup { sh '''#! /bin/bash - echo "Performing docker system prune!!" - containers=$(docker ps -aq) + echo "Pruning builder!!" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : ''' cleanWs() } From 4c041344f8a16dc13693402b06a73be7f5460e74 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 3 Feb 2025 18:29:33 +0000 Subject: [PATCH 433/452] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/external_trigger.yml | 10 +++++++++- README.md | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9f23508..5128e62 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ * Read, and fill the Pull Request template * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message -* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord) ## Common files diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index d923aba..08d4369 100755 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discord chat support - url: https://discord.gg/YWrKVTn + url: https://linuxserver.io/discord about: Realtime support / chat with the community and the team. - name: Discourse discussion forum diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 012abdc..ed71e16 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -15,7 +15,10 @@ jobs: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-bookstack\n\n" >> $GITHUB_STEP_SUMMARY - if grep -q "^bookstack_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^bookstack_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bookstack_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY + elif grep -q "^bookstack_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`bookstack_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 @@ -25,6 +28,11 @@ jobs: printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" | jq -r '. | .tag_name') echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY + if grep -q "^bookstack_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY + exit 0 + fi if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY diff --git a/README.md b/README.md index b1d25b0..7ca0daf 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![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://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![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.") @@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r 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://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [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. From 167e0a0cf23199d79e6ae8c962d33ec0e1cc977c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 10 Feb 2025 18:27:36 +0000 Subject: [PATCH 434/452] Bot Updating Templated Files --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86086e1..4cbf23a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -761,7 +763,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1187,6 +1190,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } From 9e330f439680c37441eeaa606766309bef779b20 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Feb 2025 18:28:26 +0000 Subject: [PATCH 435/452] Bot Updating Package Versions --- package_versions.txt | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 914d363..8345857 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,10 +4,10 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.2-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-r2 apk +apk-tools 2.14.6-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -29,7 +29,7 @@ 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.11.1-r0 apk +curl 8.12.1-r0 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r4 apk dflydev/dot-access-data v3.0.3 php-composer @@ -90,8 +90,8 @@ libavif 1.0.4-r0 apk libblkid 2.40.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r4 apk -libcurl 8.11.1-r0 apk +libcrypto3 3.3.3-r0 apk +libcurl 8.12.1-r0 apk libdav1d 1.5.0-r0 apk libeconf 0.6.3-r0 apk libedit 20240808.3.1-r0 apk @@ -117,7 +117,7 @@ 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.2-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 @@ -141,8 +141,8 @@ mkfontscale 1.2.3-r1 apk mockery/mockery 1.6.12 php-composer monolog/monolog 3.8.1 php-composer mtdowling/jmespath.php 2.8.0 php-composer -musl 1.2.5-r8 apk -musl-utils 1.2.5-r8 apk +musl 1.2.5-r9 apk +musl-utils 1.2.5-r9 apk myclabs/deep-copy 1.12.1 php-composer nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk @@ -157,41 +157,41 @@ nunomaduro/collision v7.11.0 php-composer nunomaduro/termwind v1.17.0 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.2-r4 apk +openssl 3.3.3-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 phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.16-r0 apk -php83-common 8.3.16-r0 apk -php83-ctype 8.3.16-r0 apk -php83-curl 8.3.16-r0 apk -php83-dom 8.3.16-r0 apk -php83-exif 8.3.16-r0 apk -php83-fileinfo 8.3.16-r0 apk -php83-fpm 8.3.16-r0 apk -php83-gd 8.3.16-r0 apk -php83-iconv 8.3.16-r0 apk -php83-ldap 8.3.16-r0 apk -php83-mbstring 8.3.16-r0 apk -php83-mysqlnd 8.3.16-r0 apk -php83-opcache 8.3.16-r0 apk -php83-openssl 8.3.16-r0 apk -php83-pdo 8.3.16-r0 apk -php83-pdo_mysql 8.3.16-r0 apk +php83 8.3.17-r0 apk +php83-common 8.3.17-r0 apk +php83-ctype 8.3.17-r0 apk +php83-curl 8.3.17-r0 apk +php83-dom 8.3.17-r0 apk +php83-exif 8.3.17-r0 apk +php83-fileinfo 8.3.17-r0 apk +php83-fpm 8.3.17-r0 apk +php83-gd 8.3.17-r0 apk +php83-iconv 8.3.17-r0 apk +php83-ldap 8.3.17-r0 apk +php83-mbstring 8.3.17-r0 apk +php83-mysqlnd 8.3.17-r0 apk +php83-opcache 8.3.17-r0 apk +php83-openssl 8.3.17-r0 apk +php83-pdo 8.3.17-r0 apk +php83-pdo_mysql 8.3.17-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.16-r0 apk -php83-session 8.3.16-r0 apk -php83-simplexml 8.3.16-r0 apk -php83-sockets 8.3.16-r0 apk -php83-tokenizer 8.3.16-r0 apk -php83-xml 8.3.16-r0 apk -php83-xmlwriter 8.3.16-r0 apk -php83-zip 8.3.16-r0 apk +php83-phar 8.3.17-r0 apk +php83-session 8.3.17-r0 apk +php83-simplexml 8.3.17-r0 apk +php83-sockets 8.3.17-r0 apk +php83-tokenizer 8.3.17-r0 apk +php83-xml 8.3.17-r0 apk +php83-xmlwriter 8.3.17-r0 apk +php83-zip 8.3.17-r0 apk phpmyadmin/sql-parser 5.10.2 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer @@ -281,7 +281,7 @@ symfony/uid v6.4.13 php-composer symfony/var-dumper v6.4.15 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer -tzdata 2024b-r1 apk +tzdata 2025a-r0 apk utmps-libs 0.1.2.3-r2 apk vlucas/phpdotenv v5.6.1 php-composer voku/portable-ascii 2.0.3 php-composer From feb8032b97f2170f5dca9ab9cfe458ed04a79ffd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 24 Feb 2025 18:31:54 +0000 Subject: [PATCH 436/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8345857..062429c 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -56,7 +56,7 @@ 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.4-r0 apk +glib 2.82.5-r0 apk graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer guzzlehttp/promises 2.0.4 php-composer @@ -133,8 +133,8 @@ libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk linux-pam 1.6.1-r1 apk logrotate 3.21.0-r1 apk -mariadb-client 11.4.4-r1 apk -mariadb-common 11.4.4-r1 apk +mariadb-client 11.4.5-r0 apk +mariadb-common 11.4.5-r0 apk masterminds/html5 2.9.0 php-composer memcached 1.6.32-r0 apk mkfontscale 1.2.3-r1 apk From 80ee30e747947073c237a0dc2de01ca140706cde Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 26 Feb 2025 15:37:51 +0000 Subject: [PATCH 437/452] Bot Updating Package Versions --- package_versions.txt | 131 +++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 66 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 062429c..801cb6b 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ 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.336.8 php-composer +aws/aws-sdk-php 3.339.19 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.1 php-composer @@ -22,7 +22,7 @@ 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 -carbonphp/carbon-doctrine-types 2.1.0 php-composer +carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.0-r0 apk composer 2.8.5 binary coreutils 9.5-r2 apk @@ -33,22 +33,18 @@ curl 8.12.1-r0 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r4 apk dflydev/dot-access-data v3.0.3 php-composer -doctrine/cache 2.2.0 php-composer -doctrine/dbal 3.9.3 php-composer -doctrine/deprecations 1.1.4 php-composer -doctrine/event-manager 2.0.1 php-composer doctrine/inflector 2.0.10 php-composer doctrine/lexer 3.0.1 php-composer -dompdf/dompdf v3.0.2 php-composer +dompdf/dompdf v3.1.0 php-composer dompdf/php-font-lib 1.0.1 php-composer dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.3 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer -filp/whoops 2.16.0 php-composer +filp/whoops 2.17.0 php-composer findutils 4.10.0-r0 apk -firebase/php-jwt v6.10.2 php-composer +firebase/php-jwt v6.11.0 php-composer font-freefont 20120503-r4 apk fontconfig 2.15.0-r1 apk freetype 2.13.3-r0 apk @@ -61,21 +57,21 @@ graham-campbell/result-type v1.1.3 php-composer guzzlehttp/guzzle 7.9.2 php-composer guzzlehttp/promises 2.0.4 php-composer guzzlehttp/psr7 2.7.0 php-composer -guzzlehttp/uri-template v1.0.3 php-composer +guzzlehttp/uri-template v1.0.4 php-composer hamcrest/hamcrest-php v2.0.1 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk -intervention/gif 4.2.0 php-composer -intervention/image 3.10.2 php-composer -itsgoingd/clockwork v5.3.2 php-composer +intervention/gif 4.2.1 php-composer +intervention/image 3.11.1 php-composer +itsgoingd/clockwork v5.3.4 php-composer jq 1.7.1-r0 apk -knplabs/knp-snappy v1.5.0 php-composer -larastan/larastan v2.9.12 php-composer -laravel/framework v10.48.25 php-composer -laravel/prompts v0.1.25 php-composer -laravel/serializable-closure v1.3.7 php-composer -laravel/socialite v5.16.1 php-composer -laravel/tinker v2.10.0 php-composer +knplabs/knp-snappy v1.5.1 php-composer +larastan/larastan v3.1.0 php-composer +laravel/framework v11.43.2 php-composer +laravel/prompts v0.3.5 php-composer +laravel/serializable-closure v2.0.3 php-composer +laravel/socialite v5.18.0 php-composer +laravel/tinker v2.10.1 php-composer league/commonmark 2.6.1 php-composer league/config v1.2.0 php-composer league/flysystem 3.29.1 php-composer @@ -85,6 +81,8 @@ 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.0 php-composer +league/uri 7.5.1 php-composer +league/uri-interfaces 7.5.0 php-composer libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk libblkid 2.40.4-r0 apk @@ -143,18 +141,18 @@ monolog/monolog 3.8.1 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.12.1 php-composer +myclabs/deep-copy 1.13.0 php-composer nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk -nesbot/carbon 2.72.6 php-composer +nesbot/carbon 3.8.6 php-composer netcat-openbsd 1.226.1.1-r0 apk nette/schema v1.3.2 php-composer nette/utils v4.0.5 php-composer nghttp2-libs 1.64.0-r0 apk nginx 1.26.2-r4 apk nikic/php-parser v5.4.0 php-composer -nunomaduro/collision v7.11.0 php-composer -nunomaduro/termwind v1.17.0 php-composer +nunomaduro/collision v8.6.1 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 @@ -192,21 +190,20 @@ php83-tokenizer 8.3.17-r0 apk php83-xml 8.3.17-r0 apk php83-xmlwriter 8.3.17-r0 apk php83-zip 8.3.17-r0 apk -phpmyadmin/sql-parser 5.10.2 php-composer +phpmyadmin/sql-parser 5.11.0 php-composer phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 1.12.14 php-composer -phpunit/php-code-coverage 10.1.16 php-composer -phpunit/php-file-iterator 4.1.0 php-composer -phpunit/php-invoker 4.0.0 php-composer -phpunit/php-text-template 3.0.1 php-composer -phpunit/php-timer 6.0.0 php-composer -phpunit/phpunit 10.5.40 php-composer +phpstan/phpstan 2.1.6 php-composer +phpunit/php-code-coverage 11.0.8 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.9 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 -psr/cache 3.0.0 php-composer psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer @@ -224,21 +221,21 @@ readline 8.2.13-r0 apk robrichards/xmlseclibs 3.1.3 php-composer sabberworm/php-css-parser v8.7.0 php-composer scanelf 1.3.8-r1 apk -sebastian/cli-parser 2.0.1 php-composer -sebastian/code-unit 2.0.0 php-composer -sebastian/code-unit-reverse-lookup 3.0.0 php-composer -sebastian/comparator 5.0.3 php-composer -sebastian/complexity 3.2.0 php-composer -sebastian/diff 5.1.1 php-composer -sebastian/environment 6.1.0 php-composer -sebastian/exporter 5.1.2 php-composer -sebastian/global-state 6.0.2 php-composer -sebastian/lines-of-code 2.0.2 php-composer -sebastian/object-enumerator 5.0.0 php-composer -sebastian/object-reflector 3.0.0 php-composer -sebastian/recursion-context 5.0.0 php-composer -sebastian/type 4.0.0 php-composer -sebastian/version 4.0.1 php-composer +sebastian/cli-parser 3.0.2 php-composer +sebastian/code-unit 3.0.2 php-composer +sebastian/code-unit-reverse-lookup 4.0.1 php-composer +sebastian/comparator 6.3.0 php-composer +sebastian/complexity 4.0.1 php-composer +sebastian/diff 6.0.2 php-composer +sebastian/environment 7.2.0 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 +sebastian/object-enumerator 6.0.1 php-composer +sebastian/object-reflector 4.0.1 php-composer +sebastian/recursion-context 6.0.2 php-composer +sebastian/type 5.1.0 php-composer +sebastian/version 5.0.2 php-composer shadow 4.16.0-r1 apk skalibs-libs 2.14.3.0-r0 apk socialiteproviders/discord 4.2.0 php-composer @@ -247,22 +244,24 @@ socialiteproviders/manager v4.8.0 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.11.2 php-composer -ssddanbrown/asserthtml v3.0.1 php-composer +squizlabs/php_codesniffer 3.11.3 php-composer +ssddanbrown/asserthtml v3.1.0 php-composer ssddanbrown/htmldiff v1.0.4 php-composer -ssddanbrown/symfony-mailer 6.4.x-dev php-composer +ssddanbrown/symfony-mailer 7.2.x-dev php-composer ssl_client 1.37.0-r12 apk -symfony/console v6.4.17 php-composer -symfony/css-selector v6.4.13 php-composer +staabm/side-effects-detector 1.0.5 php-composer +symfony/clock v7.2.0 php-composer +symfony/console v7.2.1 php-composer +symfony/css-selector v7.2.0 php-composer symfony/deprecation-contracts v3.5.1 php-composer -symfony/dom-crawler v6.4.16 php-composer -symfony/error-handler v6.4.17 php-composer -symfony/event-dispatcher v6.4.13 php-composer +symfony/dom-crawler v7.2.3 php-composer +symfony/error-handler v7.2.3 php-composer +symfony/event-dispatcher v7.2.0 php-composer symfony/event-dispatcher-contracts v3.5.1 php-composer -symfony/finder v6.4.17 php-composer -symfony/http-foundation v6.4.16 php-composer -symfony/http-kernel v6.4.17 php-composer -symfony/mime v6.4.17 php-composer +symfony/finder v7.2.2 php-composer +symfony/http-foundation v7.2.3 php-composer +symfony/http-kernel v7.2.3 php-composer +symfony/mime v7.2.3 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 @@ -271,14 +270,14 @@ 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 v6.4.15 php-composer -symfony/routing v6.4.16 php-composer +symfony/process v7.2.0 php-composer +symfony/routing v7.2.3 php-composer symfony/service-contracts v3.5.1 php-composer -symfony/string v6.4.15 php-composer -symfony/translation v6.4.13 php-composer +symfony/string v7.2.0 php-composer +symfony/translation v7.2.2 php-composer symfony/translation-contracts v3.5.1 php-composer -symfony/uid v6.4.13 php-composer -symfony/var-dumper v6.4.15 php-composer +symfony/uid v7.2.0 php-composer +symfony/var-dumper v7.2.3 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer tzdata 2025a-r0 apk From 06da7f0e0b56c7518a1e7a3343fb06bfdaa008d6 Mon Sep 17 00:00:00 2001 From: thespad <spad@linuxserver.io> Date: Sat, 8 Mar 2025 20:23:21 +0000 Subject: [PATCH 438/452] Fix backup symlink --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42096b8..3cb5246 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN \ echo "**** create symlinks ****" && \ /bin/bash -c \ '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/backup storage/framework/cache storage/framework/sessions storage/framework/views 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' && \ echo "**** cleanup ****" && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6243d04..a983af3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -51,7 +51,7 @@ RUN \ echo "**** create symlinks ****" && \ /bin/bash -c \ '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/backup storage/framework/cache storage/framework/sessions storage/framework/views 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' && \ echo "**** cleanup ****" && \ rm -rf \ From c833bc46c208b460908d8657cc241ed2bc9ec452 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 9 Mar 2025 13:52:08 +0000 Subject: [PATCH 439/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 801cb6b..6901e0e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,7 +24,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.5 binary +composer 2.8.6 binary coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk @@ -95,7 +95,7 @@ libeconf 0.6.3-r0 apk libedit 20240808.3.1-r0 apk libevent 2.1.12-r7 apk libexpat 2.6.4-r0 apk -libffi 3.4.6-r0 apk +libffi 3.4.7-r0 apk libfontenc 1.1.8-r0 apk libgcc 14.2.0-r4 apk libice 1.1.1-r6 apk From cb76bd383865a31766186b2dba7c308d901a2e4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sun, 16 Mar 2025 12:55:56 +0000 Subject: [PATCH 440/452] Bot Updating Package Versions --- package_versions.txt | 96 ++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6901e0e..be49e77 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,10 +12,10 @@ 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.339.19 php-composer +aws/aws-sdk-php 3.342.6 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk -brick/math 0.12.1 php-composer +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 @@ -42,7 +42,7 @@ dragonmantank/cron-expression v3.4.0 php-composer egulias/email-validator 4.0.3 php-composer encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer -filp/whoops 2.17.0 php-composer +filp/whoops 2.18.0 php-composer findutils 4.10.0-r0 apk firebase/php-jwt v6.11.0 php-composer font-freefont 20120503-r4 apk @@ -59,15 +59,16 @@ guzzlehttp/promises 2.0.4 php-composer guzzlehttp/psr7 2.7.0 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 intervention/gif 4.2.1 php-composer -intervention/image 3.11.1 php-composer +intervention/image 3.11.2 php-composer itsgoingd/clockwork v5.3.4 php-composer jq 1.7.1-r0 apk knplabs/knp-snappy v1.5.1 php-composer -larastan/larastan v3.1.0 php-composer -laravel/framework v11.43.2 php-composer +larastan/larastan v3.2.0 php-composer +laravel/framework v11.44.2 php-composer laravel/prompts v0.3.5 php-composer laravel/serializable-closure v2.0.3 php-composer laravel/socialite v5.18.0 php-composer @@ -80,7 +81,7 @@ league/flysystem-local 3.29.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.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 libattr 2.5.2-r2 apk @@ -125,7 +126,7 @@ libxau 1.0.11-r4 apk libxcb 1.16.1-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.13.4-r3 apk +libxml2 2.13.4-r5 apk libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk @@ -151,7 +152,7 @@ nette/utils v4.0.5 php-composer nghttp2-libs 1.64.0-r0 apk nginx 1.26.2-r4 apk nikic/php-parser v5.4.0 php-composer -nunomaduro/collision v8.6.1 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 @@ -162,44 +163,43 @@ pcre 8.45-r3 apk pcre2 10.43-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.17-r0 apk -php83-common 8.3.17-r0 apk -php83-ctype 8.3.17-r0 apk -php83-curl 8.3.17-r0 apk -php83-dom 8.3.17-r0 apk -php83-exif 8.3.17-r0 apk -php83-fileinfo 8.3.17-r0 apk -php83-fpm 8.3.17-r0 apk -php83-gd 8.3.17-r0 apk -php83-iconv 8.3.17-r0 apk -php83-ldap 8.3.17-r0 apk -php83-mbstring 8.3.17-r0 apk -php83-mysqlnd 8.3.17-r0 apk -php83-opcache 8.3.17-r0 apk -php83-openssl 8.3.17-r0 apk -php83-pdo 8.3.17-r0 apk -php83-pdo_mysql 8.3.17-r0 apk +php83 8.3.18-r0 apk +php83-common 8.3.18-r0 apk +php83-ctype 8.3.18-r0 apk +php83-curl 8.3.18-r0 apk +php83-dom 8.3.18-r0 apk +php83-exif 8.3.18-r0 apk +php83-fileinfo 8.3.18-r0 apk +php83-fpm 8.3.18-r0 apk +php83-gd 8.3.18-r0 apk +php83-iconv 8.3.18-r0 apk +php83-ldap 8.3.18-r0 apk +php83-mbstring 8.3.18-r0 apk +php83-mysqlnd 8.3.18-r0 apk +php83-opcache 8.3.18-r0 apk +php83-openssl 8.3.18-r0 apk +php83-pdo 8.3.18-r0 apk +php83-pdo_mysql 8.3.18-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.17-r0 apk -php83-session 8.3.17-r0 apk -php83-simplexml 8.3.17-r0 apk -php83-sockets 8.3.17-r0 apk -php83-tokenizer 8.3.17-r0 apk -php83-xml 8.3.17-r0 apk -php83-xmlwriter 8.3.17-r0 apk -php83-zip 8.3.17-r0 apk -phpmyadmin/sql-parser 5.11.0 php-composer +php83-phar 8.3.18-r0 apk +php83-session 8.3.18-r0 apk +php83-simplexml 8.3.18-r0 apk +php83-sockets 8.3.18-r0 apk +php83-tokenizer 8.3.18-r0 apk +php83-xml 8.3.18-r0 apk +php83-xmlwriter 8.3.18-r0 apk +php83-zip 8.3.18-r0 apk phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.6 php-composer -phpunit/php-code-coverage 11.0.8 php-composer +phpstan/phpstan 2.1.8 php-composer +phpunit/php-code-coverage 11.0.9 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.9 php-composer +phpunit/phpunit 11.5.12 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.3.0 php-composer @@ -212,10 +212,10 @@ 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.7 php-composer +psy/psysh v0.12.8 php-composer qt5-qtbase 5.15.10_git20230714-r3 apk ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 2.0.0 php-composer +ramsey/collection 2.1.0 php-composer ramsey/uuid 4.7.6 php-composer readline 8.2.13-r0 apk robrichards/xmlseclibs 3.1.3 php-composer @@ -224,7 +224,7 @@ scanelf 1.3.8-r1 apk sebastian/cli-parser 3.0.2 php-composer sebastian/code-unit 3.0.2 php-composer sebastian/code-unit-reverse-lookup 4.0.1 php-composer -sebastian/comparator 6.3.0 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 @@ -240,7 +240,7 @@ shadow 4.16.0-r1 apk skalibs-libs 2.14.3.0-r0 apk socialiteproviders/discord 4.2.0 php-composer socialiteproviders/gitlab 4.1.0 php-composer -socialiteproviders/manager v4.8.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/twitch 5.4.0 php-composer @@ -254,14 +254,14 @@ symfony/clock v7.2.0 php-composer symfony/console v7.2.1 php-composer symfony/css-selector v7.2.0 php-composer symfony/deprecation-contracts v3.5.1 php-composer -symfony/dom-crawler v7.2.3 php-composer -symfony/error-handler v7.2.3 php-composer +symfony/dom-crawler v7.2.4 php-composer +symfony/error-handler v7.2.4 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.3 php-composer -symfony/http-kernel v7.2.3 php-composer -symfony/mime v7.2.3 php-composer +symfony/http-kernel v7.2.4 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 @@ -270,11 +270,11 @@ 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.0 php-composer +symfony/process v7.2.4 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.2 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 From 600670457647a20b3c7faf20bd7a85eccbf8257c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 17 Mar 2025 18:30:33 +0000 Subject: [PATCH 441/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index be49e77..654724f 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -95,7 +95,7 @@ libdav1d 1.5.0-r0 apk libeconf 0.6.3-r0 apk libedit 20240808.3.1-r0 apk libevent 2.1.12-r7 apk -libexpat 2.6.4-r0 apk +libexpat 2.7.0-r0 apk libffi 3.4.7-r0 apk libfontenc 1.1.8-r0 apk libgcc 14.2.0-r4 apk @@ -109,7 +109,7 @@ 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 -libpng 1.6.44-r0 apk +libpng 1.6.47-r0 apk libproc2 4.0.4-r2 apk libpsl 0.21.5-r3 apk libsasl 2.1.28-r8 apk @@ -150,7 +150,7 @@ netcat-openbsd 1.226.1.1-r0 apk nette/schema v1.3.2 php-composer nette/utils v4.0.5 php-composer nghttp2-libs 1.64.0-r0 apk -nginx 1.26.2-r4 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 From 0c1bdf7b072dad7bb9b9e4d4044fe3d9a2808b46 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 31 Mar 2025 18:31:29 +0000 Subject: [PATCH 442/452] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 654724f..ff379da 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -29,7 +29,7 @@ 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-r0 apk +curl 8.12.1-r1 apk dasprid/enum 1.0.6 php-composer dbus-libs 1.14.10-r4 apk dflydev/dot-access-data v3.0.3 php-composer @@ -90,7 +90,7 @@ libblkid 2.40.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r0 apk +libcurl 8.12.1-r1 apk libdav1d 1.5.0-r0 apk libeconf 0.6.3-r0 apk libedit 20240808.3.1-r0 apk @@ -163,34 +163,34 @@ pcre 8.45-r3 apk pcre2 10.43-r0 apk phar-io/manifest 2.0.4 php-composer phar-io/version 3.2.1 php-composer -php83 8.3.18-r0 apk -php83-common 8.3.18-r0 apk -php83-ctype 8.3.18-r0 apk -php83-curl 8.3.18-r0 apk -php83-dom 8.3.18-r0 apk -php83-exif 8.3.18-r0 apk -php83-fileinfo 8.3.18-r0 apk -php83-fpm 8.3.18-r0 apk -php83-gd 8.3.18-r0 apk -php83-iconv 8.3.18-r0 apk -php83-ldap 8.3.18-r0 apk -php83-mbstring 8.3.18-r0 apk -php83-mysqlnd 8.3.18-r0 apk -php83-opcache 8.3.18-r0 apk -php83-openssl 8.3.18-r0 apk -php83-pdo 8.3.18-r0 apk -php83-pdo_mysql 8.3.18-r0 apk +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.18-r0 apk -php83-session 8.3.18-r0 apk -php83-simplexml 8.3.18-r0 apk -php83-sockets 8.3.18-r0 apk -php83-tokenizer 8.3.18-r0 apk -php83-xml 8.3.18-r0 apk -php83-xmlwriter 8.3.18-r0 apk -php83-zip 8.3.18-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 phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer phpstan/phpstan 2.1.8 php-composer From 4c90655485a40351232660d20412ed4a9c4526bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Wed, 2 Apr 2025 16:48:13 +0000 Subject: [PATCH 443/452] Bot Updating Package Versions --- package_versions.txt | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ff379da..34f66f2 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,5 +1,4 @@ NAME VERSION TYPE -Hidden Input 1, 0, 0, 0 dotnet acl-libs 2.3.2-r1 apk alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk @@ -12,7 +11,7 @@ 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.6 php-composer +aws/aws-sdk-php 3.342.18 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer @@ -39,7 +38,7 @@ dompdf/dompdf v3.1.0 php-composer dompdf/php-font-lib 1.0.1 php-composer dompdf/php-svg-lib 1.0.0 php-composer dragonmantank/cron-expression v3.4.0 php-composer -egulias/email-validator 4.0.3 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 @@ -54,15 +53,15 @@ git 2.47.2-r0 apk git-init-template 2.47.2-r0 apk glib 2.82.5-r0 apk graham-campbell/result-type v1.1.3 php-composer -guzzlehttp/guzzle 7.9.2 php-composer -guzzlehttp/promises 2.0.4 php-composer -guzzlehttp/psr7 2.7.0 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 -intervention/gif 4.2.1 php-composer +intervention/gif 4.2.2 php-composer intervention/image 3.11.2 php-composer itsgoingd/clockwork v5.3.4 php-composer jq 1.7.1-r0 apk @@ -70,8 +69,8 @@ knplabs/knp-snappy v1.5.1 php-composer larastan/larastan v3.2.0 php-composer laravel/framework v11.44.2 php-composer laravel/prompts v0.3.5 php-composer -laravel/serializable-closure v2.0.3 php-composer -laravel/socialite v5.18.0 php-composer +laravel/serializable-closure v2.0.4 php-composer +laravel/socialite v5.19.0 php-composer laravel/tinker v2.10.1 php-composer league/commonmark 2.6.1 php-composer league/config v1.2.0 php-composer @@ -138,17 +137,17 @@ 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.8.1 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.8.6 php-composer +nesbot/carbon 3.9.0 php-composer netcat-openbsd 1.226.1.1-r0 apk nette/schema v1.3.2 php-composer -nette/utils v4.0.5 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 @@ -193,13 +192,13 @@ php83-xmlwriter 8.3.19-r0 apk php83-zip 8.3.19-r0 apk phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.8 php-composer +phpstan/phpstan 2.1.11 php-composer phpunit/php-code-coverage 11.0.9 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.12 php-composer +phpunit/phpunit 11.5.15 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.3.0 php-composer @@ -215,14 +214,14 @@ psr/simple-cache 3.0.0 php-composer psy/psysh v0.12.8 php-composer qt5-qtbase 5.15.10_git20230714-r3 apk ralouphie/getallheaders 3.0.3 php-composer -ramsey/collection 2.1.0 php-composer +ramsey/collection 2.1.1 php-composer ramsey/uuid 4.7.6 php-composer readline 8.2.13-r0 apk robrichards/xmlseclibs 3.1.3 php-composer -sabberworm/php-css-parser v8.7.0 php-composer +sabberworm/php-css-parser v8.8.0 php-composer scanelf 1.3.8-r1 apk sebastian/cli-parser 3.0.2 php-composer -sebastian/code-unit 3.0.2 php-composer +sebastian/code-unit 3.0.3 php-composer sebastian/code-unit-reverse-lookup 4.0.1 php-composer sebastian/comparator 6.3.1 php-composer sebastian/complexity 4.0.1 php-composer @@ -234,7 +233,7 @@ sebastian/lines-of-code 3.0.1 php-composer sebastian/object-enumerator 6.0.1 php-composer sebastian/object-reflector 4.0.1 php-composer sebastian/recursion-context 6.0.2 php-composer -sebastian/type 5.1.0 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 @@ -244,23 +243,23 @@ socialiteproviders/manager v4.8.1 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.4.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.11.3 php-composer +squizlabs/php_codesniffer 3.12.0 php-composer ssddanbrown/asserthtml v3.1.0 php-composer ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 7.2.x-dev php-composer ssl_client 1.37.0-r12 apk staabm/side-effects-detector 1.0.5 php-composer symfony/clock v7.2.0 php-composer -symfony/console v7.2.1 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.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.3 php-composer -symfony/http-kernel v7.2.4 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 @@ -270,7 +269,7 @@ 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.4 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 From bee364899e3ad5d5ff0cb0a9191aa60af4d7e553 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 7 Apr 2025 18:31:37 +0000 Subject: [PATCH 444/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 34f66f2..e989bbf 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,7 +23,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.6 binary +composer 2.8.7 binary coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk @@ -279,7 +279,7 @@ symfony/uid v7.2.0 php-composer symfony/var-dumper v7.2.3 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer -tzdata 2025a-r0 apk +tzdata 2025b-r0 apk utmps-libs 0.1.2.3-r2 apk vlucas/phpdotenv v5.6.1 php-composer voku/portable-ascii 2.0.3 php-composer From aab1799cae9bd89ad8c72cd8ed1c4227a3d58ebe Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 14 Apr 2025 18:32:19 +0000 Subject: [PATCH 445/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e989bbf..9630266 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,12 +18,12 @@ 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 +c-ares 1.34.5-r0 apk ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.7 binary +composer 2.8.8 binary coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk @@ -284,6 +284,6 @@ utmps-libs 0.1.2.3-r2 apk vlucas/phpdotenv v5.6.1 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.6.3-r1 apk zlib 1.3.1-r2 apk zstd-libs 1.5.6-r2 apk From f92adde8134d9b04233a33383d77e0253abe6427 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 21 Apr 2025 18:31:56 +0000 Subject: [PATCH 446/452] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9630266..6a3af14 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -85,7 +85,7 @@ league/uri 7.5.1 php-composer league/uri-interfaces 7.5.0 php-composer libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk -libblkid 2.40.4-r0 apk +libblkid 2.40.4-r1 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.3-r0 apk @@ -105,7 +105,7 @@ libjpeg-turbo 3.0.4-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 +libmount 2.40.4-r1 apk libncursesw 6.5_p20241006-r3 apk libpcre2-16 10.43-r0 apk libpng 1.6.47-r0 apk @@ -118,7 +118,7 @@ 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 +libuuid 2.40.4-r1 apk libwebp 1.4.0-r0 apk libx11 1.8.10-r0 apk libxau 1.0.11-r4 apk From 5eb50e7294289e31126fa43790baaaa3d8c4ee61 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 5 May 2025 18:30:18 +0000 Subject: [PATCH 447/452] Bot Updating Package Versions --- package_versions.txt | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6a3af14..50fc8d8 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ 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.343.3 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer @@ -43,7 +43,7 @@ encodings 1.0.7-r1 apk fakerphp/faker v1.24.1 php-composer filp/whoops 2.18.0 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 freetype 2.13.3-r0 apk @@ -57,8 +57,8 @@ 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 +hamcrest/hamcrest-php v2.1.1 php-composer +iamcal/sql-parser v0.6 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 apk intervention/gif 4.2.2 php-composer @@ -66,13 +66,13 @@ intervention/image 3.11.2 php-composer itsgoingd/clockwork v5.3.4 php-composer jq 1.7.1-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.4.0 php-composer +laravel/framework v11.44.7 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.20.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-aws-s3-v3 3.29.0 php-composer @@ -141,17 +141,17 @@ 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 +myclabs/deep-copy 1.13.1 php-composer nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk -nesbot/carbon 3.9.0 php-composer +nesbot/carbon 3.9.1 php-composer netcat-openbsd 1.226.1.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/collision v8.8.0 php-composer nunomaduro/termwind v2.3.0 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk @@ -192,16 +192,16 @@ php83-xmlwriter 8.3.19-r0 apk php83-zip 8.3.19-r0 apk phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.11 php-composer +phpstan/phpstan 2.1.14 php-composer phpunit/php-code-coverage 11.0.9 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.19 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer -predis/predis v2.3.0 php-composer +predis/predis v2.4.0 php-composer procps-ng 4.0.4-r2 apk psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer @@ -241,16 +241,16 @@ 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.12.2 php-composer ssddanbrown/asserthtml v3.1.0 php-composer ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 7.2.x-dev php-composer ssl_client 1.37.0-r12 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/console v7.2.6 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 @@ -258,30 +258,30 @@ 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/http-foundation v7.2.6 php-composer +symfony/http-kernel v7.2.6 php-composer +symfony/mime v7.2.6 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.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/string v7.2.6 php-composer +symfony/translation v7.2.6 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/var-dumper v7.2.6 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 +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-r1 apk From 481bdb6a8b87909b9c32c5f6c3f9c7a474bdcb53 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Thu, 8 May 2025 15:41:50 +0000 Subject: [PATCH 448/452] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 50fc8d8..9b6a1b6 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ 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.343.3 php-composer +aws/aws-sdk-php 3.343.6 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer @@ -152,7 +152,7 @@ nghttp2-libs 1.64.0-r0 apk nginx 1.26.3-r0 apk nikic/php-parser v5.4.0 php-composer nunomaduro/collision v8.8.0 php-composer -nunomaduro/termwind v2.3.0 php-composer +nunomaduro/termwind v2.3.1 php-composer onelogin/php-saml 4.2.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.3-r0 apk From 9c2b40c91430b325a4b46ef7a002f10269f37e03 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 17 May 2025 11:28:57 +0000 Subject: [PATCH 449/452] Bot Updating Templated Files --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index cebfc8d..caed560 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 From 336d5ba3f7e71a1b6269fce41c4b3dce8e39135f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 17 May 2025 11:31:42 +0000 Subject: [PATCH 450/452] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9b6a1b6..7f17ee3 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -11,7 +11,7 @@ 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.343.6 php-composer +aws/aws-sdk-php 3.343.13 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer @@ -23,7 +23,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.0-r0 apk -composer 2.8.8 binary +composer 2.8.9 binary coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk @@ -125,7 +125,7 @@ libxau 1.0.11-r4 apk libxcb 1.16.1-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.13.4-r5 apk +libxml2 2.13.4-r6 apk libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk @@ -192,13 +192,13 @@ php83-xmlwriter 8.3.19-r0 apk php83-zip 8.3.19-r0 apk phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.14 php-composer +phpstan/phpstan 2.1.16 php-composer phpunit/php-code-coverage 11.0.9 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.19 php-composer +phpunit/phpunit 11.5.20 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.4.0 php-composer @@ -243,7 +243,7 @@ socialiteproviders/manager v4.8.1 php-composer socialiteproviders/microsoft-azure 5.2.0 php-composer socialiteproviders/okta 4.5.0 php-composer socialiteproviders/twitch 5.4.0 php-composer -squizlabs/php_codesniffer 3.12.2 php-composer +squizlabs/php_codesniffer 3.13.0 php-composer ssddanbrown/asserthtml v3.1.0 php-composer ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 7.2.x-dev php-composer From 4cb2d86fd37a8aaf266785844969d147d7dc17e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Mon, 26 May 2025 18:33:36 +0000 Subject: [PATCH 451/452] Bot Updating Package Versions --- package_versions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/package_versions.txt b/package_versions.txt index 7f17ee3..de86767 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,4 +1,5 @@ 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 From 92ab5632eddb74afcba3c91b2ecafa9b1850555d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI <ci@linuxserver.io> Date: Sat, 31 May 2025 13:44:53 +0000 Subject: [PATCH 452/452] Bot Updating Package Versions --- package_versions.txt | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index de86767..2ad3e9e 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,7 +12,7 @@ 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.343.13 php-composer +aws/aws-sdk-php 3.343.22 php-composer bacon/bacon-qr-code v3.0.1 php-composer bash 5.2.37-r0 apk brick/math 0.12.3 php-composer @@ -63,15 +63,15 @@ iamcal/sql-parser v0.6 php-composer icu-data-full 74.2-r0 apk icu-libs 74.2-r0 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 knplabs/knp-snappy v1.5.1 php-composer larastan/larastan v3.4.0 php-composer -laravel/framework v11.44.7 php-composer +laravel/framework v11.45.0 php-composer laravel/prompts v0.3.5 php-composer laravel/serializable-closure v2.0.4 php-composer -laravel/socialite v5.20.0 php-composer +laravel/socialite v5.21.0 php-composer laravel/tinker v2.10.1 php-composer league/commonmark 2.7.0 php-composer league/config v1.2.0 php-composer @@ -151,10 +151,10 @@ 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 +nikic/php-parser v5.5.0 php-composer nunomaduro/collision v8.8.0 php-composer nunomaduro/termwind v2.3.1 php-composer -onelogin/php-saml 4.2.0 php-composer +onelogin/php-saml 4.3.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.3-r0 apk paragonie/constant_time_encoding v3.0.0 php-composer @@ -193,13 +193,13 @@ php83-xmlwriter 8.3.19-r0 apk php83-zip 8.3.19-r0 apk phpoption/phpoption 1.9.3 php-composer phpseclib/phpseclib 3.0.43 php-composer -phpstan/phpstan 2.1.16 php-composer +phpstan/phpstan 2.1.17 php-composer phpunit/php-code-coverage 11.0.9 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.20 php-composer +phpunit/phpunit 11.5.21 php-composer popt 1.19-r4 apk pragmarx/google2fa v8.0.3 php-composer predis/predis v2.4.0 php-composer @@ -227,7 +227,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 @@ -250,18 +250,18 @@ ssddanbrown/htmldiff v1.0.4 php-composer ssddanbrown/symfony-mailer 7.2.x-dev php-composer ssl_client 1.37.0-r12 apk staabm/side-effects-detector 1.0.5 php-composer -symfony/clock v7.2.0 php-composer -symfony/console v7.2.6 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.6 php-composer -symfony/http-kernel v7.2.6 php-composer -symfony/mime v7.2.6 php-composer +symfony/clock v7.3.0 php-composer +symfony/console v7.3.0 php-composer +symfony/css-selector v7.3.0 php-composer +symfony/deprecation-contracts v3.6.0 php-composer +symfony/dom-crawler v7.3.0 php-composer +symfony/error-handler v7.3.0 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.0 php-composer +symfony/http-kernel v7.3.0 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 @@ -270,14 +270,14 @@ 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.2.5 php-composer -symfony/routing v7.2.3 php-composer -symfony/service-contracts v3.5.1 php-composer -symfony/string v7.2.6 php-composer -symfony/translation v7.2.6 php-composer -symfony/translation-contracts v3.5.1 php-composer -symfony/uid v7.2.0 php-composer -symfony/var-dumper v7.2.6 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.0 php-composer +symfony/translation-contracts v3.6.0 php-composer +symfony/uid v7.3.0 php-composer +symfony/var-dumper v7.3.0 php-composer theseer/tokenizer 1.2.3 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer tzdata 2025b-r0 apk