Merge pull request #266 from linuxserver/php8-deprecate-branch

Deprecate php8 branch

.github/ISSUE_TEMPLATE/issue.bug.md

@@ -3,6 +3,10 @@ name: Bug report
 about: Create a report to help us improve
 
 ---
+# DEPRECATION NOTICE
+
+This image is deprecated. We will not offer support for this image and it will not be updated.
+The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated.
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 

.github/ISSUE_TEMPLATE/issue.feature.md

@@ -3,6 +3,10 @@ name: Feature request
 about: Suggest an idea for this project
 
 ---
+# DEPRECATION NOTICE
+
+This image is deprecated. We will not offer support for this image and it will not be updated.
+The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated.
 [linuxserverurl]: https://linuxserver.io
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,7 @@
+# DEPRECATION NOTICE
+
+This image is deprecated. We will not offer support for this image and it will not be updated.
+The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated.
 <!--- Provide a general summary of your changes in the Title above -->
 
 [linuxserverurl]: https://linuxserver.io

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of php8 branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_PHP8\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}')
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases/latest | jq -r '. | .tag_name' | sed 's|^v||')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for nextcloud branch php8"

.github/workflows/greetings.yml

@@ -8,6 +8,6 @@ jobs:
     steps:
     - uses: actions/first-interaction@v1
       with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'This image is deprecated. We will not offer support for this image and it will not be updated. The [README](https://github.com/linuxserver/docker-nextcloud/blob/php8/README.md) may have additional information. Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'This image is deprecated. We will not offer support for this image and it will not be updated. The [README](https://github.com/linuxserver/docker-nextcloud/blob/php8/README.md) may have additional information. Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -80,7 +80,7 @@ RUN \
   echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
+    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
     -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
     -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
     -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
@@ -97,8 +97,9 @@ RUN \
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \
-      | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \
+    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
+      | awk '/tag_name/{print $4;exit}' FS='[""]' \
+      | sed 's|^v||'); \
   fi && \
   echo "**** download nextcloud ****" && \
   curl -o /app/nextcloud.tar.bz2 -L \

Dockerfile.aarch64

@@ -80,7 +80,7 @@ RUN \
   echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
+    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=16/g' \
     -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
     -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
     -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
@@ -97,8 +97,9 @@ RUN \
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \
-      | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \
+    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
+      | awk '/tag_name/{print $4;exit}' FS='[""]' \
+      | sed 's|^v||'); \
   fi && \
   echo "**** download nextcloud ****" && \
   curl -o /app/nextcloud.tar.bz2 -L \

Dockerfile.armhf

@@ -80,7 +80,7 @@ RUN \
   echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \
   sed -i \
     -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
-    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
+    -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=168/g' \
     -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \
     -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \
     -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \
@@ -97,8 +97,9 @@ RUN \
   echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \
   echo "**** set version tag ****" && \
   if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \
-      | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \
+    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
+      | awk '/tag_name/{print $4;exit}' FS='[""]' \
+      | sed 's|^v||'); \
   fi && \
   echo "**** download nextcloud ****" && \
   curl -o /app/nextcloud.tar.bz2 -L \

Jenkinsfile

@@ -56,7 +56,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/etc/cont-init.d/99-deprecation'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php | awk -F\\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}' ''',
+            script: ''' curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest | jq -r '. | .tag_name' | sed 's|^v||' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -312,6 +312,7 @@ pipeline {
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/root/etc/cont-init.d
                 cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
@@ -319,6 +320,7 @@ pipeline {
                   git add .gitignore
                 fi
                 git add ${TEMPLATED_FILES}
+                git rm ${TEMPDIR}/repo/${LS_REPO}/.github/workflows/{external_trigger,external_trigger_scheduler,package_trigger,package_trigger_scheduler}.yml || :
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -342,10 +344,16 @@ pipeline {
               fi
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
+                if ! grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                  echo "${CONTAINER_NAME}" >> ${TEMPDIR}/unraid/templates/unraid/ignore.list
+                  git add unraid/ignore.list
+                fi
                 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
@@ -708,7 +716,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -27,6 +27,10 @@ Find us at:
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
 
+# DEPRECATION NOTICE
+
+This image is deprecated. We will not offer support for this image and it will not be updated.
+The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated.
 # [linuxserver/nextcloud](https://github.com/linuxserver/docker-nextcloud)
 
 [![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnextcloud?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fnextcloud)
@@ -48,17 +52,17 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch
 
 ## 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/nextcloud` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/nextcloud:php8` 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
 
@@ -97,7 +101,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   nextcloud:
-    image: lscr.io/linuxserver/nextcloud
+    image: lscr.io/linuxserver/nextcloud:php8
     container_name: nextcloud
     environment:
       - PUID=1000
@@ -123,7 +127,7 @@ docker run -d \
   -v /path/to/appdata:/config \
   -v /path/to/data:/data \
   --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud
+  lscr.io/linuxserver/nextcloud:php8
 ```
 
 ## Parameters
@@ -182,7 +186,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:php8`
 
 ## Updating Info
 
@@ -200,7 +204,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/nextcloud`
+* Update the image: `docker pull lscr.io/linuxserver/nextcloud:php8`
 * Stop the running container: `docker stop nextcloud`
 * Delete the container: `docker rm nextcloud`
 * 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)
@@ -235,7 +239,7 @@ cd docker-nextcloud
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/nextcloud:latest .
+  -t lscr.io/linuxserver/nextcloud:php8 .
 ```
 
 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -248,6 +252,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **05.06.22:** - Bring `php8` tag in line with `latest`.
 * **24.06.21:** - Rebase to alpine 3.14.
 * **01.04.21:** - Fix crontab during upgrade from php7.
 * **16.03.21:** - Rebase on the php8 nginx baseimage.

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-nextcloud
 external_type: na
-custom_version_command: "curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php | awk -F\\\\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'"
+custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest | jq -r '. | .tag_name' | sed 's|^v||'"
 release_type: prerelease
 release_tag: php8
 ls_branch: php8

package_versions.txt

@@ -2,38 +2,38 @@ alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
 alsa-lib-1.2.5-r2
 aom-libs-1.0.0-r3
-apache2-utils-2.4.53-r0
+apache2-utils-2.4.54-r0
 apk-tools-2.12.7-r0
-apr-1.7.0-r0
+apr-1.7.0-r1
 apr-util-1.6.1-r7
 argon2-libs-20190702-r1
 avahi-libs-0.8-r5
 bash-5.1.16-r0
 brotli-libs-1.0.9-r5
-busybox-1.33.1-r6
+busybox-1.33.1-r8
 c-client-2007f-r11
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
-cairo-1.16.0-r3
-cairo-gobject-1.16.0-r3
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
+cairo-1.16.0-r5
+cairo-gobject-1.16.0-r5
 coreutils-8.32-r2
-cups-libs-2.3.3-r2
-curl-7.79.1-r0
-dbus-libs-1.12.20-r2
-expat-2.4.7-r0
+cups-libs-2.3.3-r3
+curl-7.79.1-r3
+dbus-libs-1.12.24-r0
+expat-2.4.9-r0
 ffmpeg-4.4.1-r0
 ffmpeg-libs-4.4.1-r0
 fontconfig-2.13.1-r4
-freetype-2.10.4-r1
+freetype-2.10.4-r3
 fribidi-1.0.10-r0
 gdbm-1.19-r0
-gdk-pixbuf-2.42.6-r0
+gdk-pixbuf-2.42.6-r1
 ghostscript-9.54.0-r1
-git-2.32.0-r0
+git-2.32.4-r0
 glib-2.68.3-r0
 gmp-6.2.1-r1
 gnu-libiconv-1.16-r0
-gnutls-3.7.1-r0
+gnutls-3.7.1-r1
 graphite2-1.3.14-r0
 harfbuzz-2.8.1-r0
 icu-libs-67.1-r2
@@ -45,7 +45,7 @@ lame-3.100-r0
 lcms2-2.12-r1
 ldb-2.3.3-r0
 libacl-2.2.53-r0
-libarchive-3.5.2-r0
+libarchive-3.5.3-r0
 libass-0.15.1-r0
 libattr-2.5.1-r0
 libblkid-2.37.4-r0
@@ -53,10 +53,10 @@ libbsd-0.11.3-r0
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
 libcap-2.50-r0
-libcrypto1.1-1.1.1n-r0
-libcurl-7.79.1-r0
+libcrypto1.1-1.1.1q-r0
+libcurl-7.79.1-r3
 libdav1d-0.9.0-r0
-libde265-1.0.8-r1
+libde265-1.0.8-r2
 libdrm-2.4.106-r0
 libedit-20210216.3.1-r0
 libffi-3.3-r2
@@ -76,7 +76,7 @@ libmount-2.37.4-r0
 libogg-1.3.5-r0
 libpciaccess-0.16-r0
 libpng-1.6.37-r1
-libpq-13.6-r0
+libpq-13.8-r0
 libproc-3.3.17-r0
 libressl3.3-libcrypto-3.3.6-r0
 libressl3.3-libssl-3.3.6-r0
@@ -88,7 +88,7 @@ libsmbclient-4.14.12-r0
 libsodium-1.0.18-r0
 libsrt-1.4.2-r0
 libssh-0.9.6-r0
-libssl1.1-1.1.1n-r0
+libssl1.1-1.1.1q-r0
 libstdc++-10.3.1_git20210424-r2
 libtasn1-4.17.0-r0
 libtheora-1.1.1-r16
@@ -100,80 +100,80 @@ libvorbis-1.3.7-r0
 libvpx-1.10.0-r0
 libwbclient-4.14.12-r0
 libwebp-1.2.0-r2
-libx11-1.7.2-r0
+libx11-1.7.3.1-r0
 libxau-1.0.9-r0
 libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
 libxft-2.3.3-r0
-libxml2-2.9.13-r0
+libxml2-2.9.14-r2
 libxpm-3.5.13-r0
 libxrender-0.9.10-r3
 libxt-1.2.1-r0
 libzip-1.7.3-r2
 linux-pam-1.5.1-r1
 lmdb-0.9.29-r0
-logrotate-3.18.1-r1
+logrotate-3.18.1-r4
 lz4-libs-1.9.3-r1
 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
 nettle-3.7.3-r0
 nghttp2-libs-1.43.0-r0
-nginx-1.20.2-r0
+nginx-1.20.2-r1
 oniguruma-6.9.7.1-r0
-openssl-1.1.1n-r0
+openssl-1.1.1q-r0
 opus-1.3.1-r1
 p11-kit-0.23.22-r0
 pango-1.48.5-r0
 pcre-8.44-r0
-pcre2-10.36-r0
-php8-8.0.13-r0
-php8-bcmath-8.0.13-r0
-php8-bz2-8.0.13-r0
-php8-common-8.0.13-r0
-php8-ctype-8.0.13-r0
-php8-curl-8.0.13-r0
-php8-dom-8.0.13-r0
-php8-exif-8.0.13-r0
-php8-fileinfo-8.0.13-r0
+pcre2-10.36-r1
+php8-8.0.24-r0
+php8-bcmath-8.0.24-r0
+php8-bz2-8.0.24-r0
+php8-common-8.0.24-r0
+php8-ctype-8.0.24-r0
+php8-curl-8.0.24-r0
+php8-dom-8.0.24-r0
+php8-exif-8.0.24-r0
+php8-fileinfo-8.0.24-r0
 php8-fpm-8.0.13-r0
-php8-ftp-8.0.13-r0
-php8-gd-8.0.13-r0
-php8-gmp-8.0.13-r0
-php8-iconv-8.0.13-r0
-php8-imap-8.0.13-r0
-php8-intl-8.0.13-r0
-php8-ldap-8.0.13-r0
-php8-mbstring-8.0.13-r0
-php8-mysqlnd-8.0.13-r0
-php8-opcache-8.0.13-r0
-php8-openssl-8.0.13-r0
-php8-pcntl-8.0.13-r0
-php8-pdo-8.0.13-r0
-php8-pdo_mysql-8.0.13-r0
-php8-pdo_pgsql-8.0.13-r0
-php8-pdo_sqlite-8.0.13-r0
+php8-ftp-8.0.24-r0
+php8-gd-8.0.24-r0
+php8-gmp-8.0.24-r0
+php8-iconv-8.0.24-r0
+php8-imap-8.0.24-r0
+php8-intl-8.0.24-r0
+php8-ldap-8.0.24-r0
+php8-mbstring-8.0.24-r0
+php8-mysqlnd-8.0.24-r0
+php8-opcache-8.0.24-r0
+php8-openssl-8.0.24-r0
+php8-pcntl-8.0.24-r0
+php8-pdo-8.0.24-r0
+php8-pdo_mysql-8.0.24-r0
+php8-pdo_pgsql-8.0.24-r0
+php8-pdo_sqlite-8.0.24-r0
 php8-pecl-apcu-5.1.21-r0
 php8-pecl-igbinary-3.2.6-r0
 php8-pecl-imagick-3.5.0-r1
 php8-pecl-mcrypt-1.0.4-r0
 php8-pecl-memcached-3.1.5-r1
 php8-pecl-redis-5.3.4-r0
-php8-pgsql-8.0.13-r0
-php8-phar-8.0.13-r0
-php8-posix-8.0.13-r0
-php8-session-8.0.13-r0
+php8-pgsql-8.0.24-r0
+php8-phar-8.0.24-r0
+php8-posix-8.0.24-r0
+php8-session-8.0.24-r0
 php8-simplexml-8.0.13-r0
-php8-sodium-8.0.13-r0
-php8-sqlite3-8.0.13-r0
+php8-sodium-8.0.24-r0
+php8-sqlite3-8.0.24-r0
 php8-xml-8.0.13-r0
-php8-xmlreader-8.0.13-r0
+php8-xmlreader-8.0.24-r0
 php8-xmlwriter-8.0.13-r0
-php8-zip-8.0.13-r0
+php8-zip-8.0.24-r0
 pixman-0.40.0-r2
 pkgconf-1.7.4-r0
 popt-1.18-r0
@@ -192,14 +192,14 @@ shared-mime-info-2.1-r0
 skalibs-2.10.0.3-r0
 soxr-0.1.3-r2
 sqlite-libs-3.35.5-r0
-ssl_client-1.33.1-r6
+ssl_client-1.33.1-r8
 sudo-1.9.7_p1-r1
 talloc-2.3.2-r1
 tar-1.34-r0
 tdb-libs-1.4.3-r1
 tevent-0.10.2-r1
-tiff-4.2.0-r1
-tzdata-2022a-r0
+tiff-4.4.0-r0
+tzdata-2022c-r0
 unzip-6.0-r9
 utmps-0.1.0.2-r0
 v4l-utils-libs-1.20.0-r0
@@ -209,7 +209,7 @@ wayland-libs-client-1.19.0-r0
 x264-libs-20210211-r0
 x265-libs-3.4-r0
 xvidcore-1.3.7-r1
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
+xz-5.2.5-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r3
 zstd-libs-1.4.9-r1

readme-vars.yml

@@ -11,6 +11,10 @@ project_blurb: |
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 project_blurb_optional_extras_enabled: false
 
+# deprecation information
+project_deprecation_status: true
+project_deprecation_message: "The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated."
+
 # supported architectures
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -75,6 +79,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.06.22:", desc: "Bring `php8` tag in line with `latest`." }
   - { date: "24.06.21:", desc: "Rebase to alpine 3.14." }
   - { date: "01.04.21:", desc: "Fix crontab during upgrade from php7." }
   - { date: "16.03.21:", desc: "Rebase on the php8 nginx baseimage." }

root/defaults/default

@@ -27,6 +27,7 @@ server {
 
     # set max upload size
     client_max_body_size 512M;
+    client_body_timeout 300s;
     fastcgi_buffers 64 4K;
 
     # Enable gzip but do not remove ETag headers
@@ -35,7 +36,7 @@ server {
     gzip_comp_level 4;
     gzip_min_length 256;
     gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-    gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
+    gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/wasm application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
 
     # HTTP response headers borrowed from Nextcloud `.htaccess`
     add_header Referrer-Policy                      "no-referrer"   always;
@@ -85,25 +86,32 @@ server {
     # `location ~ /(\.|autotest|...)` which would otherwise handle requests
     # for `/.well-known`.
     location ^~ /.well-known {
-        # The following 6 rules are borrowed from `.htaccess`
+        # The rules in this block are an adaptation of the rules
+        # in `.htaccess` that concern `/.well-known`.
 
-        location = /.well-known/carddav     { return 301 /remote.php/dav/; }
-        location = /.well-known/caldav      { return 301 /remote.php/dav/; }
-        # Anything else is dynamically handled by Nextcloud
-        location ^~ /.well-known            { return 301 /index.php$uri; }
+        location = /.well-known/carddav { return 301 /remote.php/dav/; }
+        location = /.well-known/caldav  { return 301 /remote.php/dav/; }
 
-        try_files $uri $uri/ =404;
+        location /.well-known/acme-challenge    { try_files $uri $uri/ =404; }
+        location /.well-known/pki-validation    { try_files $uri $uri/ =404; }
+
+        # Let Nextcloud's API for `/.well-known` URIs handle all other
+        # requests by passing them to the front-end controller.
+        return 301 /index.php$request_uri;
     }
 
     # Rules borrowed from `.htaccess` to hide certain paths from clients
     location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/)  { return 404; }
-    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)              { return 404; }
+    location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console)                { return 404; }
 
     # Ensure this block, which passes PHP files to the PHP process, is above the blocks
     # which handle static assets (as seen below). If this block is not declared first,
     # then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
     # to the URI, resulting in a HTTP 500 error response.
     location ~ \.php(?:$|/) {
+        # Required for legacy support
+        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+
         fastcgi_split_path_info ^(.+?\.php)(/.*)$;
         set $path_info $fastcgi_path_info;
 
@@ -120,12 +128,18 @@ server {
 
         fastcgi_intercept_errors on;
         fastcgi_request_buffering off;
+
+        fastcgi_max_temp_file_size 0;
     }
 
-    location ~ \.(?:css|js|svg|gif)$ {
+    location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
         try_files $uri /index.php$request_uri;
         expires 6M;         # Cache-Control policy borrowed from `.htaccess`
         access_log off;     # Optional: Don't log access to assets
+
+        location ~ \.wasm$ {
+            default_type application/wasm;
+        }
     }
 
     location ~ \.woff2?$ {
@@ -134,6 +148,11 @@ server {
         access_log off;     # Optional: Don't log access to assets
     }
 
+    # Rule borrowed from `.htaccess`
+    location /remote {
+        return 301 /remote.php$request_uri;
+    }
+
     location / {
         try_files $uri $uri/ /index.php$request_uri;
     }

root/etc/cont-init.d/99-deprecation

@@ -0,0 +1,19 @@
+#!/usr/bin/with-contenv bash
+
+echo '
+******************************************************
+******************************************************
+*                                                    *
+*                                                    *
+*             This image is deprecated.              *
+*      We will not offer support for this image      *
+*             and it will not be updated.            *
+*                                                    *
+*                                                    *
+******************************************************
+******************************************************
+
+The latest tag (master branch) now uses php8. The php8 tag/branch will not be updated.
+
+******************************************************
+******************************************************'