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 01/11] 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 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 02/11] 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 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 03/11] 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 04/11] 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 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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