From 4e7da407fbc794ec7b77337065d310fa37e69c4d Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 27 Jan 2022 03:18:43 +0100
Subject: [PATCH 01/33] Bot Updating Package Versions

---
 package_versions.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 487152c..2a63626 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -8,11 +8,11 @@ argon2-libs-20190702-r1
 bash-5.1.4-r0
 brotli-libs-1.0.9-r5
 busybox-1.33.1-r6
-ca-certificates-20191127-r5
-ca-certificates-bundle-20191127-r5
+ca-certificates-20211220-r0
+ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
 curl-7.79.1-r0
-expat-2.4.1-r0
+expat-2.4.3-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0

From ea9d6de9d96fc2037047395c6665e1143b28527c Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 10 Feb 2022 03:18:22 +0100
Subject: [PATCH 02/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 2a63626..6aa28ce 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -43,7 +43,7 @@ libsasl-2.1.27-r12
 libsm-1.2.3-r0
 libssl1.1-1.1.1l-r0
 libstdc++-10.3.1_git20210424-r2
-libuuid-2.37.2-r0
+libuuid-2.37.3-r0
 libwebp-1.2.0-r2
 libx11-1.7.2-r0
 libxau-1.0.9-r0
@@ -55,7 +55,7 @@ libxpm-3.5.13-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
-logrotate-3.18.1-r0
+logrotate-3.18.1-r1
 musl-1.2.2-r3
 musl-utils-1.2.2-r3
 nano-5.7-r2

From 76da17155ad523662798ab7fcb2a63aba95db634 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 17 Feb 2022 03:15:57 +0100
Subject: [PATCH 03/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 6aa28ce..f934d16 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -12,7 +12,7 @@ ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
 curl-7.79.1-r0
-expat-2.4.3-r0
+expat-2.4.4-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0
@@ -43,7 +43,7 @@ libsasl-2.1.27-r12
 libsm-1.2.3-r0
 libssl1.1-1.1.1l-r0
 libstdc++-10.3.1_git20210424-r2
-libuuid-2.37.3-r0
+libuuid-2.37.4-r0
 libwebp-1.2.0-r2
 libx11-1.7.2-r0
 libxau-1.0.9-r0

From a7e98d42cdee381d4df85f8c83f8c7739dfe9c94 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 3 Mar 2022 03:36:17 +0100
Subject: [PATCH 04/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index f934d16..a5711d4 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -12,7 +12,7 @@ ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
 curl-7.79.1-r0
-expat-2.4.4-r0
+expat-2.4.5-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0

From 70ef70946fa6a4d89deebc604ebe68aa25c92488 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 9 Mar 2022 20:40:26 -0600
Subject: [PATCH 05/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index a5711d4..2d679e4 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -12,12 +12,12 @@ ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
 curl-7.79.1-r0
-expat-2.4.5-r0
+expat-2.4.6-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0
 git-2.32.0-r0
-gmp-6.2.1-r0
+gmp-6.2.1-r1
 libacl-2.2.53-r0
 libattr-2.5.1-r0
 libbsd-0.11.3-r0

From d9f8032c56525a4998eda4ae21b0ccbb58a769eb Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 16 Mar 2022 21:35:35 -0500
Subject: [PATCH 06/33] Bot Updating Package Versions

---
 package_versions.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 2d679e4..fd25c5e 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -12,7 +12,7 @@ ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
 curl-7.79.1-r0
-expat-2.4.6-r0
+expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0
@@ -23,7 +23,7 @@ libattr-2.5.1-r0
 libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r0
+libcrypto1.1-1.1.1n-r0
 libcurl-7.79.1-r0
 libedit-20210216.3.1-r0
 libgcc-10.3.1_git20210424-r2
@@ -41,7 +41,7 @@ libressl3.3-libssl-3.3.3-r0
 libretls-3.3.3p1-r2
 libsasl-2.1.27-r12
 libsm-1.2.3-r0
-libssl1.1-1.1.1l-r0
+libssl1.1-1.1.1n-r0
 libstdc++-10.3.1_git20210424-r2
 libuuid-2.37.4-r0
 libwebp-1.2.0-r2
@@ -50,7 +50,7 @@ libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.12-r1
+libxml2-2.9.13-r0
 libxpm-3.5.13-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2

From 4dfc56c5855ee588dc05e74d5ae67cad121d0b2f Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 23 Mar 2022 21:43:24 -0500
Subject: [PATCH 07/33] 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 fd25c5e..0941222 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,6 +1,6 @@
 alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
-apache2-utils-2.4.52-r0
+apache2-utils-2.4.53-r0
 apk-tools-2.12.7-r0
 apr-1.7.0-r0
 apr-util-1.6.1-r7
@@ -36,10 +36,10 @@ libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
 libpng-1.6.37-r1
 libproc-3.3.17-r0
-libressl3.3-libcrypto-3.3.3-r0
-libressl3.3-libssl-3.3.3-r0
+libressl3.3-libcrypto-3.3.6-r0
+libressl3.3-libssl-3.3.6-r0
 libretls-3.3.3p1-r2
-libsasl-2.1.27-r12
+libsasl-2.1.28-r0
 libsm-1.2.3-r0
 libssl1.1-1.1.1n-r0
 libstdc++-10.3.1_git20210424-r2
@@ -64,7 +64,7 @@ ncurses-terminfo-base-6.2_p20210612-r0
 nghttp2-libs-1.43.0-r0
 nginx-1.20.2-r0
 oniguruma-6.9.7.1-r0
-openssl-1.1.1l-r0
+openssl-1.1.1n-r0
 pcre-8.44-r0
 pcre2-10.36-r0
 php7-7.4.26-r0

From d38bc249fca889fd35905b3d562018f5fa2383d3 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 31 Mar 2022 04:48:37 +0200
Subject: [PATCH 08/33] Bot Updating Package Versions

---
 package_versions.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 0941222..1b5b928 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -5,7 +5,7 @@ apk-tools-2.12.7-r0
 apr-1.7.0-r0
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
-bash-5.1.4-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r5
 busybox-1.33.1-r6
 ca-certificates-20211220-r0
@@ -38,7 +38,7 @@ libpng-1.6.37-r1
 libproc-3.3.17-r0
 libressl3.3-libcrypto-3.3.6-r0
 libressl3.3-libssl-3.3.6-r0
-libretls-3.3.3p1-r2
+libretls-3.3.3p1-r3
 libsasl-2.1.28-r0
 libsm-1.2.3-r0
 libssl1.1-1.1.1n-r0
@@ -109,10 +109,10 @@ scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
 ssl_client-1.33.1-r6
-tzdata-2021e-r0
+tzdata-2022a-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9
 utmps-0.1.0.2-r0
 xz-5.2.5-r0
 xz-libs-5.2.5-r0
-zlib-1.2.11-r3
+zlib-1.2.12-r0

From 918adb4b388036faba95032ce60c314c63b716c7 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 7 Apr 2022 04:47:46 +0200
Subject: [PATCH 09/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 1b5b928..b81a54d 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -7,7 +7,7 @@ apr-util-1.6.1-r7
 argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r6
+busybox-1.33.1-r7
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
@@ -108,7 +108,7 @@ s6-ipcserver-2.10.0.3-r0
 scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
-ssl_client-1.33.1-r6
+ssl_client-1.33.1-r7
 tzdata-2022a-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9

From 29507fc70419ea4dfc8dbad52756955a147bb1e1 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 13 Apr 2022 21:59:51 -0500
Subject: [PATCH 10/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index b81a54d..f48dfbf 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -114,5 +114,5 @@ unixodbc-2.3.9-r1
 unzip-6.0-r9
 utmps-0.1.0.2-r0
 xz-5.2.5-r0
-xz-libs-5.2.5-r0
+xz-libs-5.2.5-r1
 zlib-1.2.12-r0

From dbf8adaa0cd44562bd852a1352d9e22aedd68583 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 20 Apr 2022 22:21:42 -0500
Subject: [PATCH 11/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index f48dfbf..2a959b5 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -16,7 +16,7 @@ expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
 gdbm-1.19-r0
-git-2.32.0-r0
+git-2.32.1-r0
 gmp-6.2.1-r1
 libacl-2.2.53-r0
 libattr-2.5.1-r0
@@ -113,6 +113,6 @@ tzdata-2022a-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9
 utmps-0.1.0.2-r0
-xz-5.2.5-r0
+xz-5.2.5-r1
 xz-libs-5.2.5-r1
 zlib-1.2.12-r0

From 023e4f9981e48086085daad78aa8936fff7c01a6 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 27 Apr 2022 23:03:26 -0500
Subject: [PATCH 12/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 2a959b5..8c473fd 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -11,7 +11,7 @@ busybox-1.33.1-r7
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
-curl-7.79.1-r0
+curl-7.79.1-r1
 expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r1
@@ -24,7 +24,7 @@ libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcrypto1.1-1.1.1n-r0
-libcurl-7.79.1-r0
+libcurl-7.79.1-r1
 libedit-20210216.3.1-r0
 libgcc-10.3.1_git20210424-r2
 libice-1.0.10-r0

From aa04af1e76d798b33c017d6ed06101b2929a486a Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 5 May 2022 05:15:13 +0200
Subject: [PATCH 13/33] Bot Updating Templated Files

---
 Jenkinsfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 249e183..11fc6e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -353,9 +353,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml

From b9f8bb9502605937a85cd6f9a5764adeff772249 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 4 May 2022 22:16:45 -0500
Subject: [PATCH 14/33] Bot Updating Templated Files

---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 3574809..1ae0aec 100644
--- a/README.md
+++ b/README.md
@@ -46,17 +46,17 @@ Find us at:
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/projectsend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/projectsend:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Application Setup
 
@@ -77,7 +77,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   projectsend:
-    image: lscr.io/linuxserver/projectsend
+    image: lscr.io/linuxserver/projectsend:latest
     container_name: projectsend
     environment:
       - PUID=1000
@@ -105,7 +105,7 @@ docker run -d \
   -v <path to data>:/config \
   -v <path to data>:/data \
   --restart unless-stopped \
-  lscr.io/linuxserver/projectsend
+  lscr.io/linuxserver/projectsend:latest
 ```
 
 ## Parameters
@@ -165,7 +165,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' projectsend`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/projectsend`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/projectsend:latest`
 
 ## Updating Info
 
@@ -183,7 +183,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/projectsend`
+* Update the image: `docker pull lscr.io/linuxserver/projectsend:latest`
 * Stop the running container: `docker stop projectsend`
 * Delete the container: `docker rm projectsend`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)

From 8af12c2aab5b6bb5b57becbde48760f0a66c15bc Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 11 May 2022 22:08:49 -0500
Subject: [PATCH 15/33] 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 8c473fd..48ac450 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -14,7 +14,7 @@ coreutils-8.32-r2
 curl-7.79.1-r1
 expat-2.4.7-r0
 freetds-1.2.21-r0
-freetype-2.10.4-r1
+freetype-2.10.4-r2
 gdbm-1.19-r0
 git-2.32.1-r0
 gmp-6.2.1-r1
@@ -23,7 +23,7 @@ libattr-2.5.1-r0
 libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1n-r0
+libcrypto1.1-1.1.1o-r0
 libcurl-7.79.1-r1
 libedit-20210216.3.1-r0
 libgcc-10.3.1_git20210424-r2
@@ -41,7 +41,7 @@ libressl3.3-libssl-3.3.6-r0
 libretls-3.3.3p1-r3
 libsasl-2.1.28-r0
 libsm-1.2.3-r0
-libssl1.1-1.1.1n-r0
+libssl1.1-1.1.1o-r0
 libstdc++-10.3.1_git20210424-r2
 libuuid-2.37.4-r0
 libwebp-1.2.0-r2
@@ -50,7 +50,7 @@ libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.13-r0
+libxml2-2.9.14-r0
 libxpm-3.5.13-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2
@@ -62,7 +62,7 @@ nano-5.7-r2
 ncurses-libs-6.2_p20210612-r0
 ncurses-terminfo-base-6.2_p20210612-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
+nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
 openssl-1.1.1n-r0
 pcre-8.44-r0
@@ -115,4 +115,4 @@ unzip-6.0-r9
 utmps-0.1.0.2-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r0
+zlib-1.2.12-r1

From e48ad16a457893c679805cd9825357b38e928e42 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 19 May 2022 05:19:17 +0200
Subject: [PATCH 16/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 48ac450..694ac38 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -64,7 +64,7 @@ ncurses-terminfo-base-6.2_p20210612-r0
 nghttp2-libs-1.43.0-r0
 nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1n-r0
+openssl-1.1.1o-r0
 pcre-8.44-r0
 pcre2-10.36-r0
 php7-7.4.26-r0

From 3236df434d9241bd85bc230fe16669911f2d5a0d Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 25 May 2022 22:18:51 -0500
Subject: [PATCH 17/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 694ac38..59c70c1 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -14,7 +14,7 @@ coreutils-8.32-r2
 curl-7.79.1-r1
 expat-2.4.7-r0
 freetds-1.2.21-r0
-freetype-2.10.4-r2
+freetype-2.10.4-r3
 gdbm-1.19-r0
 git-2.32.1-r0
 gmp-6.2.1-r1

From 008d3544ea196b0729e2ff0998aab3a187507e63 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 26 May 2022 18:00:59 +0200
Subject: [PATCH 18/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 59c70c1..ed2e905 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -16,7 +16,7 @@ expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r3
 gdbm-1.19-r0
-git-2.32.1-r0
+git-2.32.2-r0
 gmp-6.2.1-r1
 libacl-2.2.53-r0
 libattr-2.5.1-r0

From 289d12eda5067dcedf326a7d56cab4ba1bdff9f8 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 8 Jun 2022 22:18:19 -0500
Subject: [PATCH 19/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index ed2e905..1214663 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -2,7 +2,7 @@ alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
 apache2-utils-2.4.53-r0
 apk-tools-2.12.7-r0
-apr-1.7.0-r0
+apr-1.7.0-r1
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
 bash-5.1.16-r0

From 12ad022d1f5994dd91f053ddb31bf0241b67989a Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 15 Jun 2022 22:17:51 -0500
Subject: [PATCH 20/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 1214663..d3de754 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -55,7 +55,7 @@ libxpm-3.5.13-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
-logrotate-3.18.1-r1
+logrotate-3.18.1-r2
 musl-1.2.2-r3
 musl-utils-1.2.2-r3
 nano-5.7-r2
@@ -66,7 +66,7 @@ nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
 openssl-1.1.1o-r0
 pcre-8.44-r0
-pcre2-10.36-r0
+pcre2-10.36-r1
 php7-7.4.26-r0
 php7-bcmath-7.4.26-r0
 php7-bz2-7.4.26-r0

From 3786671fe3e38158782e5346c88aba45eaea700a Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 23 Jun 2022 05:25:30 +0200
Subject: [PATCH 21/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index d3de754..016db1a 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,6 +1,6 @@
 alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
-apache2-utils-2.4.53-r0
+apache2-utils-2.4.54-r0
 apk-tools-2.12.7-r0
 apr-1.7.0-r1
 apr-util-1.6.1-r7

From d4a9ce0c06a108cc8b581cba16fe148abec7de9d Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 30 Jun 2022 05:30:20 +0200
Subject: [PATCH 22/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 016db1a..d8c126d 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -55,7 +55,7 @@ libxpm-3.5.13-r0
 libxt-1.2.1-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
-logrotate-3.18.1-r2
+logrotate-3.18.1-r3
 musl-1.2.2-r3
 musl-utils-1.2.2-r3
 nano-5.7-r2

From 24d50a899de0e899366bbcb6baf40db6b732a681 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 7 Jul 2022 05:35:17 +0200
Subject: [PATCH 23/33] Bot Updating Package Versions

---
 package_versions.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index d8c126d..3479bf0 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -11,7 +11,7 @@ busybox-1.33.1-r7
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
-curl-7.79.1-r1
+curl-7.79.1-r2
 expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r3
@@ -23,8 +23,8 @@ libattr-2.5.1-r0
 libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1o-r0
-libcurl-7.79.1-r1
+libcrypto1.1-1.1.1q-r0
+libcurl-7.79.1-r2
 libedit-20210216.3.1-r0
 libgcc-10.3.1_git20210424-r2
 libice-1.0.10-r0
@@ -41,7 +41,7 @@ libressl3.3-libssl-3.3.6-r0
 libretls-3.3.3p1-r3
 libsasl-2.1.28-r0
 libsm-1.2.3-r0
-libssl1.1-1.1.1o-r0
+libssl1.1-1.1.1q-r0
 libstdc++-10.3.1_git20210424-r2
 libuuid-2.37.4-r0
 libwebp-1.2.0-r2

From 3cbe811f72dc788dec944f238fb36de233a838ee Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 13 Jul 2022 22:44:40 -0500
Subject: [PATCH 24/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 3479bf0..6950b71 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -64,7 +64,7 @@ ncurses-terminfo-base-6.2_p20210612-r0
 nghttp2-libs-1.43.0-r0
 nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1o-r0
+openssl-1.1.1q-r0
 pcre-8.44-r0
 pcre2-10.36-r1
 php7-7.4.26-r0

From 4446e026e63243031559734a30821b74f65d7fa1 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 20 Jul 2022 22:29:54 -0500
Subject: [PATCH 25/33] Bot Updating Package Versions

---
 package_versions.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 6950b71..6d68e5c 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -7,7 +7,7 @@ apr-util-1.6.1-r7
 argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r7
+busybox-1.33.1-r8
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-8.32-r2
@@ -16,7 +16,7 @@ expat-2.4.7-r0
 freetds-1.2.21-r0
 freetype-2.10.4-r3
 gdbm-1.19-r0
-git-2.32.2-r0
+git-2.32.3-r0
 gmp-6.2.1-r1
 libacl-2.2.53-r0
 libattr-2.5.1-r0
@@ -108,7 +108,7 @@ s6-ipcserver-2.10.0.3-r0
 scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
-ssl_client-1.33.1-r7
+ssl_client-1.33.1-r8
 tzdata-2022a-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9

From 7a7d101f3941c69f0cc44ec9a78f5d070203f677 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 27 Jul 2022 22:28:38 -0500
Subject: [PATCH 26/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 6d68e5c..72cad3f 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -59,8 +59,8 @@ logrotate-3.18.1-r3
 musl-1.2.2-r3
 musl-utils-1.2.2-r3
 nano-5.7-r2
-ncurses-libs-6.2_p20210612-r0
-ncurses-terminfo-base-6.2_p20210612-r0
+ncurses-libs-6.2_p20210612-r1
+ncurses-terminfo-base-6.2_p20210612-r1
 nghttp2-libs-1.43.0-r0
 nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0

From 58d794f73ccec135b7be7138b23e7fd17407d60b Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Wed, 3 Aug 2022 22:20:47 -0500
Subject: [PATCH 27/33] Bot Updating Package Versions

---
 package_versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index 72cad3f..399ba20 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -8,8 +8,8 @@ argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
 busybox-1.33.1-r8
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
 coreutils-8.32-r2
 curl-7.79.1-r2
 expat-2.4.7-r0

From 007c70252fedf5884bda298dc59562871f1c38b0 Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Thu, 11 Aug 2022 05:13:30 +0200
Subject: [PATCH 28/33] Bot Updating Package Versions

---
 package_versions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package_versions.txt b/package_versions.txt
index 399ba20..1adacc2 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -115,4 +115,4 @@ unzip-6.0-r9
 utmps-0.1.0.2-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r1
+zlib-1.2.12-r3

From 63695397675d39799a2d18b1ad24c5d697b8cbf9 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 14 Oct 2021 16:16:08 -0500
Subject: [PATCH 29/33] Use standard nginx.conf from lsio alpine nginx base
 image

---
 Dockerfile                      | 67 +++++++++++++++++----------------
 Dockerfile.aarch64              | 67 +++++++++++++++++----------------
 Dockerfile.armhf                | 67 +++++++++++++++++----------------
 README.md                       |  1 +
 package_versions.txt            | 18 ++++-----
 readme-vars.yml                 |  1 +
 root/app/projectsend/index.html | 40 ++++++++++++++++++++
 root/defaults/default           | 28 --------------
 root/etc/cont-init.d/30-config  | 29 +++++++-------
 9 files changed, 167 insertions(+), 151 deletions(-)
 create mode 100644 root/app/projectsend/index.html
 delete mode 100644 root/defaults/default

diff --git a/Dockerfile b/Dockerfile
index cecc2e3..cceb232 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,35 +11,37 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add -U --upgrade --no-cache \
   curl \
-  php7-bcmath \
-  php7-bz2 \
-  php7-cli \
-  php7-ctype \
-  php7-curl \
-  php7-dom \
-  php7-fileinfo \
-  php7-gd \
-  php7-gettext \
-  php7-gmp \
-  php7-json \
-  php7-iconv \
-  php7-mbstring \
-  php7-mcrypt \
-  php7-mysqli \
-  php7-openssl \
-  php7-pdo \
-  php7-pdo_dblib \
-  php7-pdo_mysql \
-  php7-pecl-apcu \
-  php7-pecl-memcached \
-  php7-phar \
-  php7-soap \
-  php7-xmlreader \
-  php7-xmlrpc \
-  php7-zip \
+  php8-bcmath \
+  php8-bz2 \
+  php8-cli \
+  php8-ctype \
+  php8-curl \
+  php8-dom \
+  php8-fileinfo \
+  php8-gd \
+  php8-gettext \
+  php8-gmp \
+  php8-iconv \
+  php8-json \
+  php8-mbstring \
+  php8-mysqli \
+  php8-openssl \
+  php8-pdo \
+  php8-pdo_dblib \
+  php8-pdo_mysql \
+  php8-pecl-apcu \
+  php8-pecl-mcrypt \
+  php8-pecl-memcached \
+  php8-phar \
+  php8-soap \
+  php8-xmlreader \
+  php8-zip \
   unzip && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-xmlrpc && \
   echo "**** install projectsend ****" && \
-  mkdir -p /app/projectsend && \
+  mkdir -p /app/www/public && \
   if [ -z ${PROJECTSEND_VERSION+x} ]; then \
     PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
@@ -49,9 +51,9 @@ RUN \
     "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
   unzip \
     /tmp/projectsend.zip -d \
-    /app/projectsend && \
-  mv /app/projectsend/upload /defaults/ && \
-  mv /app/projectsend /app/projectsend-tmp && \
+    /app/www/public && \
+  mv /app/www/public/upload /defaults/ && \
+  mv /app/www/public /app/www/public-tmp && \
   echo "**** cleanup ****" && \
     rm -rf \
     /tmp/*
@@ -60,5 +62,4 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config /data
+EXPOSE 80 443
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index b8cd95e..fe3e1a7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,35 +11,37 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add -U --upgrade --no-cache \
   curl \
-  php7-bcmath \
-  php7-bz2 \
-  php7-cli \
-  php7-ctype \
-  php7-curl \
-  php7-dom \
-  php7-fileinfo \
-  php7-gd \
-  php7-gettext \
-  php7-gmp \
-  php7-json \
-  php7-iconv \
-  php7-mbstring \
-  php7-mcrypt \
-  php7-mysqli \
-  php7-openssl \
-  php7-pdo \
-  php7-pdo_dblib \
-  php7-pdo_mysql \
-  php7-pecl-apcu \
-  php7-pecl-memcached \
-  php7-phar \
-  php7-soap \
-  php7-xmlreader \
-  php7-xmlrpc \
-  php7-zip \
+  php8-bcmath \
+  php8-bz2 \
+  php8-cli \
+  php8-ctype \
+  php8-curl \
+  php8-dom \
+  php8-fileinfo \
+  php8-gd \
+  php8-gettext \
+  php8-gmp \
+  php8-iconv \
+  php8-json \
+  php8-mbstring \
+  php8-mysqli \
+  php8-openssl \
+  php8-pdo \
+  php8-pdo_dblib \
+  php8-pdo_mysql \
+  php8-pecl-apcu \
+  php8-pecl-mcrypt \
+  php8-pecl-memcached \
+  php8-phar \
+  php8-soap \
+  php8-xmlreader \
+  php8-zip \
   unzip && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-xmlrpc && \
   echo "**** install projectsend ****" && \
-  mkdir -p /app/projectsend && \
+  mkdir -p /app/www/public && \
   if [ -z ${PROJECTSEND_VERSION+x} ]; then \
     PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
@@ -49,9 +51,9 @@ RUN \
     "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
   unzip \
     /tmp/projectsend.zip -d \
-    /app/projectsend && \
-  mv /app/projectsend/upload /defaults/ && \
-  mv /app/projectsend /app/projectsend-tmp && \
+    /app/www/public && \
+  mv /app/www/public/upload /defaults/ && \
+  mv /app/www/public /app/www/public-tmp && \
   echo "**** cleanup ****" && \
     rm -rf \
     /tmp/*
@@ -60,5 +62,4 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config /data
+EXPOSE 80 443
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 93eb9f1..2d7fac7 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -11,35 +11,37 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add -U --upgrade --no-cache \
   curl \
-  php7-bcmath \
-  php7-bz2 \
-  php7-cli \
-  php7-ctype \
-  php7-curl \
-  php7-dom \
-  php7-fileinfo \
-  php7-gd \
-  php7-gettext \
-  php7-gmp \
-  php7-json \
-  php7-iconv \
-  php7-mbstring \
-  php7-mcrypt \
-  php7-mysqli \
-  php7-openssl \
-  php7-pdo \
-  php7-pdo_dblib \
-  php7-pdo_mysql \
-  php7-pecl-apcu \
-  php7-pecl-memcached \
-  php7-phar \
-  php7-soap \
-  php7-xmlreader \
-  php7-xmlrpc \
-  php7-zip \
+  php8-bcmath \
+  php8-bz2 \
+  php8-cli \
+  php8-ctype \
+  php8-curl \
+  php8-dom \
+  php8-fileinfo \
+  php8-gd \
+  php8-gettext \
+  php8-gmp \
+  php8-iconv \
+  php8-json \
+  php8-mbstring \
+  php8-mysqli \
+  php8-openssl \
+  php8-pdo \
+  php8-pdo_dblib \
+  php8-pdo_mysql \
+  php8-pecl-apcu \
+  php8-pecl-mcrypt \
+  php8-pecl-memcached \
+  php8-phar \
+  php8-soap \
+  php8-xmlreader \
+  php8-zip \
   unzip && \
+  apk add --no-cache \
+    --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+    php8-pecl-xmlrpc && \
   echo "**** install projectsend ****" && \
-  mkdir -p /app/projectsend && \
+  mkdir -p /app/www/public && \
   if [ -z ${PROJECTSEND_VERSION+x} ]; then \
     PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
@@ -49,9 +51,9 @@ RUN \
     "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \
   unzip \
     /tmp/projectsend.zip -d \
-    /app/projectsend && \
-  mv /app/projectsend/upload /defaults/ && \
-  mv /app/projectsend /app/projectsend-tmp && \
+    /app/www/public && \
+  mv /app/www/public/upload /defaults/ && \
+  mv /app/www/public /app/www/public-tmp && \
   echo "**** cleanup ****" && \
     rm -rf \
     /tmp/*
@@ -60,5 +62,4 @@ RUN \
 COPY root/ /
 
 # ports and volumes
-EXPOSE 80
-VOLUME /config /data
+EXPOSE 80 443
diff --git a/README.md b/README.md
index 1ae0aec..e3348fe 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **24.06.21:** - Rebasing to alpine 3.14, switch to nginx
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **01.06.20:** - Rebasing to alpine 3.12.
diff --git a/package_versions.txt b/package_versions.txt
index 1adacc2..d4b30fc 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,15 +1,15 @@
 alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
-apache2-utils-2.4.54-r0
+apache2-utils-2.4.51-r0
 apk-tools-2.12.7-r0
 apr-1.7.0-r1
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r8
-ca-certificates-20220614-r0
-ca-certificates-bundle-20220614-r0
+busybox-1.33.1-r6
+ca-certificates-20191127-r5
+ca-certificates-bundle-20191127-r5
 coreutils-8.32-r2
 curl-7.79.1-r2
 expat-2.4.7-r0
@@ -43,7 +43,7 @@ libsasl-2.1.28-r0
 libsm-1.2.3-r0
 libssl1.1-1.1.1q-r0
 libstdc++-10.3.1_git20210424-r2
-libuuid-2.37.4-r0
+libuuid-2.37.2-r0
 libwebp-1.2.0-r2
 libx11-1.7.2-r0
 libxau-1.0.9-r0
@@ -62,11 +62,11 @@ nano-5.7-r2
 ncurses-libs-6.2_p20210612-r1
 ncurses-terminfo-base-6.2_p20210612-r1
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r1
+nginx-1.20.2-r0
 oniguruma-6.9.7.1-r0
 openssl-1.1.1q-r0
 pcre-8.44-r0
-pcre2-10.36-r1
+pcre2-10.36-r0
 php7-7.4.26-r0
 php7-bcmath-7.4.26-r0
 php7-bz2-7.4.26-r0
@@ -108,8 +108,8 @@ s6-ipcserver-2.10.0.3-r0
 scanelf-1.3.2-r0
 shadow-4.8.1-r0
 skalibs-2.10.0.3-r0
-ssl_client-1.33.1-r8
-tzdata-2022a-r0
+ssl_client-1.33.1-r6
+tzdata-2021e-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9
 utmps-0.1.0.2-r0
diff --git a/readme-vars.yml b/readme-vars.yml
index 440dbbd..7200452 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -54,6 +54,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "24.06.21:", desc: "Rebasing to alpine 3.14, switch to nginx"}
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
diff --git a/root/app/projectsend/index.html b/root/app/projectsend/index.html
new file mode 100644
index 0000000..2ac31be
--- /dev/null
+++ b/root/app/projectsend/index.html
@@ -0,0 +1,40 @@
+<html>
+    <head>
+        <title>Upgrade Required!</title>
+        <style>
+        body{
+            font-family: Helvetica, Arial, sans-serif;
+        }
+        .message{
+            width:440px;
+            padding:20px 40px;
+            margin:0 auto;
+            background-color:#f9f9f9;
+            border:1px solid #ddd;
+            color: #1e3d62;
+        }
+        center{
+            margin:40px 0;
+        }
+        h1{
+            font-size: 18px;
+            line-height: 26px;
+        }
+        p{
+            font-size: 12px;
+        }
+        a{
+            color: rgb(207, 48, 139);
+        }
+        </style>
+    </head>
+    <body>
+        <div class="message">
+            <h1>Upgrade Required!</h1>
+            <p>The application inside this image has been moved to a new folder.</p>
+            <p>You will need to update your <strong>/config/nginx/nginx.conf</strong> and <strong>/config/nginx/site-confs/default.conf</strong> in order for the application to work.</p>
+            <p>New config samples are located at <strong>/config/nginx/nginx.conf.sample</strong> and <strong>/config/nginx/site-confs/default.conf.sample</strong></p>
+            <p>Please review our announcement: <a target="_blank" href="https://info.linuxserver.io/issues/2022-08-20-nginx-base/">Significant changes to nginx based images</a></p>
+        </div>
+    </body>
+</html>
diff --git a/root/defaults/default b/root/defaults/default
deleted file mode 100644
index 062bf67..0000000
--- a/root/defaults/default
+++ /dev/null
@@ -1,28 +0,0 @@
-#config-v1
-server {
-        listen 80 default_server;
-
-        listen 443 ssl;
-
-        root /app/projectsend;
-        index index.html index.htm index.php;
-
-        server_name _;
-
-        ssl_certificate /config/keys/cert.crt;
-        ssl_certificate_key /config/keys/cert.key;
-
-        client_max_body_size 0;
-
-        location / {
-                try_files $uri $uri/ /index.php?$query_string;
-        }
-
-        location ~ \.php$ {
-                fastcgi_split_path_info ^(.+\.php)(/.+)$;
-                fastcgi_pass 127.0.0.1:9000;
-                fastcgi_index index.php;
-                include /etc/nginx/fastcgi_params;
-                fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-        }
-}
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index cf7d766..9b6bd60 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -1,8 +1,8 @@
 #!/usr/bin/with-contenv bash
 
-if [ -d /app/projectsend-tmp ]; then
+if [ -d /app/www/public-tmp ]; then
     echo "New container detected. Setting up app folder and fixing permissions."
-    mv /app/projectsend-tmp /app/projectsend
+    mv /app/www/public-tmp /app/www/public
     chown -R abc:abc /app
 fi
 
@@ -24,16 +24,12 @@ sed -i \
     -e "s#;*max_file_uploads =.*#max_file_uploads = ${PHP_MAX_FILE_UPLOAD}#i" \
     -e "s#;*post_max_size =.*#post_max_size = ${USABLE_MAX_UPLOAD}M#i" \
     -e "s#;*cgi.fix_pathinfo=.*#cgi.fix_pathinfo= 0#i" \
-        /etc/php7/php.ini
-
-if ! grep -q 'config-v1' /config/nginx/site-confs/default; then
-    cp /defaults/default /config/nginx/site-confs
-fi
+        /etc/php8/php.ini
 
 # copy config
 PREV_DIR=$(pwd)
 
-cd /defaults/upload || exit
+cd /defaults/upload || exit 1
 shopt -s globstar nullglob
 shopt -s dotglob
     for i in *
@@ -47,16 +43,19 @@ shopt -s dotglob
 shopt -u globstar nullglob
 shopt -u dotglob
 
-cd "${PREV_DIR}" || exit
+cd "${PREV_DIR}" || exit 1
 
 # create symlinks
-[[ ! -L /app/projectsend/upload ]] && \
-    ln -sf /data/projectsend /app/projectsend/upload
+if [[ ! -L /app/www/public/upload ]]; then
+    ln -sf /data/projectsend /app/www/public/upload
+fi
 
-[[ -f /app/projectsend/includes/sys.config.php ]] && \
-    rm /app/projectsend/includes/sys.config.php
-[[ ! -L /app/projectsend/includes/sys.config.php ]] && \
-    ln -sf /config/projectsend/sys.config.php /app/projectsend/includes/sys.config.php
+if [[ -f /app/www/public/includes/sys.config.php ]]; then
+    rm /app/www/public/includes/sys.config.php
+fi
+if [[ ! -L /app/www/public/includes/sys.config.php ]]; then
+    ln -sf /config/projectsend/sys.config.php /app/www/public/includes/sys.config.php
+fi
 
 # permissions
 echo "Fixing app data permissions."

From 887556c3b1ba7c542c91f954d850db3031755afb Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sat, 20 Aug 2022 18:55:11 -0500
Subject: [PATCH 30/33] Add default location migration

---
 root/migrations/02-default-location | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 root/migrations/02-default-location

diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location
new file mode 100644
index 0000000..4b2195f
--- /dev/null
+++ b/root/migrations/02-default-location
@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bash
+
+DEFAULT_CONF="/config/nginx/site-confs/default.conf"
+OLD_ROOT="root /app/projectsend;"
+NEW_ROOT="root /app/www/public;"
+
+if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then
+    echo "updating root in ${DEFAULT_CONF}"
+    sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
+fi

From f5adc3e3ab75e26c59195a43e395f8b43c216c2c Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 21 Aug 2022 16:55:17 -0500
Subject: [PATCH 31/33] Keep /config volume consistently

---
 Dockerfile         | 1 +
 Dockerfile.aarch64 | 1 +
 Dockerfile.armhf   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index cceb232..aa0f464 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,3 +63,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 80 443
+VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index fe3e1a7..6bc6b60 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -63,3 +63,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 80 443
+VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 2d7fac7..41345f8 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -63,3 +63,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 80 443
+VOLUME /config

From 72646bd45190c88879d0c7ec23ff955c75466108 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 21 Aug 2022 17:05:46 -0500
Subject: [PATCH 32/33] Keep /config volume consistently

---
 Dockerfile         | 4 ++--
 Dockerfile.aarch64 | 4 ++--
 Dockerfile.armhf   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aa0f464..67c9c8a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,9 +58,9 @@ RUN \
     rm -rf \
     /tmp/*
 
-# add local files
+# copy local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 80 443
 VOLUME /config
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6bc6b60..46cdd5c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -58,9 +58,9 @@ RUN \
     rm -rf \
     /tmp/*
 
-# add local files
+# copy local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 80 443
 VOLUME /config
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 41345f8..dd9449c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -58,9 +58,9 @@ RUN \
     rm -rf \
     /tmp/*
 
-# add local files
+# copy local files
 COPY root/ /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 80 443
 VOLUME /config

From df6de88e0a51a01f1121ec25de3e17a4f184fe8c Mon Sep 17 00:00:00 2001
From: LinuxServer-CI <ci@linuxserver.io>
Date: Mon, 22 Aug 2022 08:11:21 -0500
Subject: [PATCH 33/33] Bot Updating Package Versions

---
 package_versions.txt | 159 +++++++++++++++++++++----------------------
 1 file changed, 78 insertions(+), 81 deletions(-)

diff --git a/package_versions.txt b/package_versions.txt
index d4b30fc..74c648c 100755
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,118 +1,115 @@
-alpine-baselayout-3.2.0-r16
-alpine-keys-2.4-r0
-apache2-utils-2.4.51-r0
-apk-tools-2.12.7-r0
+alpine-baselayout-3.2.0-r18
+alpine-keys-2.4-r1
+apache2-utils-2.4.54-r0
+apk-tools-2.12.7-r3
 apr-1.7.0-r1
-apr-util-1.6.1-r7
+apr-util-1.6.1-r11
 argon2-libs-20190702-r1
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r6
-ca-certificates-20191127-r5
-ca-certificates-bundle-20191127-r5
-coreutils-8.32-r2
-curl-7.79.1-r2
+busybox-1.34.1-r7
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
+coreutils-9.0-r2
+curl-7.80.0-r2
 expat-2.4.7-r0
-freetds-1.2.21-r0
-freetype-2.10.4-r3
-gdbm-1.19-r0
-git-2.32.3-r0
+freetds-1.3.3-r2
+freetype-2.11.1-r2
+gdbm-1.22-r0
+git-2.34.4-r0
 gmp-6.2.1-r1
 libacl-2.2.53-r0
-libattr-2.5.1-r0
-libbsd-0.11.3-r0
+libattr-2.5.1-r1
+libbsd-0.11.3-r1
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcrypto1.1-1.1.1q-r0
-libcurl-7.79.1-r2
-libedit-20210216.3.1-r0
-libgcc-10.3.1_git20210424-r2
+libcurl-7.80.0-r2
+libedit-20210910.3.1-r0
+libgcc-10.3.1_git20211027-r0
 libice-1.0.10-r0
 libintl-0.21-r0
-libjpeg-turbo-2.1.0-r0
-libmagic-5.40-r1
+libjpeg-turbo-2.1.2-r0
 libmcrypt-2.5.8-r9
 libmd-1.0.3-r0
 libmemcached-libs-1.0.18-r4
 libpng-1.6.37-r1
 libproc-3.3.17-r0
-libressl3.3-libcrypto-3.3.6-r0
-libressl3.3-libssl-3.3.6-r0
-libretls-3.3.3p1-r3
+libretls-3.3.4-r3
 libsasl-2.1.28-r0
 libsm-1.2.3-r0
 libssl1.1-1.1.1q-r0
-libstdc++-10.3.1_git20210424-r2
-libuuid-2.37.2-r0
-libwebp-1.2.0-r2
+libstdc++-10.3.1_git20211027-r0
+libuuid-2.37.4-r0
+libwebp-1.2.2-r0
 libx11-1.7.2-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
-libxml2-2.9.14-r0
+libxml2-2.9.14-r1
 libxpm-3.5.13-r0
 libxt-1.2.1-r0
-libzip-1.7.3-r2
-linux-pam-1.5.1-r1
+libzip-1.8.0-r1
+linux-pam-1.5.2-r0
 logrotate-3.18.1-r3
-musl-1.2.2-r3
-musl-utils-1.2.2-r3
-nano-5.7-r2
-ncurses-libs-6.2_p20210612-r1
-ncurses-terminfo-base-6.2_p20210612-r1
-nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
+musl-1.2.2-r7
+musl-utils-1.2.2-r7
+nano-5.9-r0
+ncurses-libs-6.3_p20211120-r1
+ncurses-terminfo-base-6.3_p20211120-r1
+nghttp2-libs-1.46.0-r0
+nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
 openssl-1.1.1q-r0
-pcre-8.44-r0
-pcre2-10.36-r0
-php7-7.4.26-r0
-php7-bcmath-7.4.26-r0
-php7-bz2-7.4.26-r0
-php7-common-7.4.26-r0
-php7-ctype-7.4.26-r0
-php7-curl-7.4.26-r0
-php7-dom-7.4.26-r0
-php7-fileinfo-7.4.26-r0
-php7-fpm-7.4.26-r0
-php7-gd-7.4.26-r0
-php7-gettext-7.4.26-r0
-php7-gmp-7.4.26-r0
-php7-iconv-7.4.26-r0
-php7-json-7.4.26-r0
-php7-mbstring-7.4.26-r0
-php7-mysqli-7.4.26-r0
-php7-mysqlnd-7.4.26-r0
-php7-openssl-7.4.26-r0
-php7-pdo-7.4.26-r0
-php7-pdo_dblib-7.4.26-r0
-php7-pdo_mysql-7.4.26-r0
-php7-pecl-apcu-5.1.21-r0
-php7-pecl-igbinary-3.2.6-r0
-php7-pecl-mcrypt-1.0.4-r0
-php7-pecl-memcached-3.1.5-r2
-php7-phar-7.4.26-r0
-php7-session-7.4.26-r0
-php7-simplexml-7.4.26-r0
-php7-soap-7.4.26-r0
-php7-xml-7.4.26-r0
-php7-xmlreader-7.4.26-r0
-php7-xmlrpc-7.4.26-r0
-php7-xmlwriter-7.4.26-r0
-php7-zip-7.4.26-r0
+pcre-8.45-r1
+pcre2-10.40-r0
+php8-8.0.18-r0
+php8-bcmath-8.0.18-r0
+php8-bz2-8.0.18-r0
+php8-common-8.0.18-r0
+php8-ctype-8.0.18-r0
+php8-curl-8.0.18-r0
+php8-dom-8.0.18-r0
+php8-fileinfo-8.0.18-r0
+php8-fpm-8.0.18-r0
+php8-gd-8.0.18-r0
+php8-gettext-8.0.18-r0
+php8-gmp-8.0.18-r0
+php8-iconv-8.0.18-r0
+php8-mbstring-8.0.18-r0
+php8-mysqli-8.0.18-r0
+php8-mysqlnd-8.0.18-r0
+php8-openssl-8.0.18-r0
+php8-pdo-8.0.18-r0
+php8-pdo_dblib-8.0.18-r0
+php8-pdo_mysql-8.0.18-r0
+php8-pecl-apcu-5.1.21-r0
+php8-pecl-igbinary-3.2.6-r0
+php8-pecl-mcrypt-1.0.4-r0
+php8-pecl-memcached-3.1.5-r1
+php8-pecl-xmlrpc-1.0.0_rc3-r0
+php8-phar-8.0.18-r0
+php8-session-8.0.18-r0
+php8-simplexml-8.0.18-r0
+php8-soap-8.0.18-r0
+php8-xml-8.0.18-r0
+php8-xmlreader-8.0.18-r0
+php8-xmlwriter-8.0.18-r0
+php8-zip-8.0.18-r0
 popt-1.18-r0
 procps-3.3.17-r0
-readline-8.1.0-r0
-s6-ipcserver-2.10.0.3-r0
-scanelf-1.3.2-r0
-shadow-4.8.1-r0
-skalibs-2.10.0.3-r0
-ssl_client-1.33.1-r6
-tzdata-2021e-r0
+readline-8.1.1-r0
+s6-ipcserver-2.11.0.0-r0
+scanelf-1.3.3-r0
+shadow-4.8.1-r1
+skalibs-2.11.0.0-r0
+ssl_client-1.34.1-r7
+tzdata-2022a-r0
 unixodbc-2.3.9-r1
 unzip-6.0-r9
-utmps-0.1.0.2-r0
+utmps-0.1.0.3-r0
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
 zlib-1.2.12-r3
+zstd-libs-1.5.0-r0