Bot Updating Package Versions

2026-06-03 09:57:35 +00:00 · 2022-09-04 17:34:32 +02:00 · 2022-08-28 17:34:29 +02:00 · 2022-08-21 17:33:48 +02:00 · 2022-08-12 04:17:55 -05:00 · 2022-08-07 10:33:15 -05:00
45 changed files with 810 additions and 816 deletions
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2

-[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4
@@ -24,7 +24,7 @@
 ## Readme

 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-nextcloud/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-nextcloud/edit/php8/readme-vars.yml).

 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-nextcloud)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Update the changelog

-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-nextcloud/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-nextcloud/tree/php8/root), add an entry to the changelog

 ```yml
 changelogs:
@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- Provide a general summary of the bug in the Title above -->
+
+------------------------------
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Environment
+**OS:**
+**CPU architecture:** x86_64/arm32/arm64
+**How docker service was installed:**
+<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Command used to create docker container (run/create/compose/screenshot)
+<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
+
+## Docker logs
+<!--- Provide a full docker log, output of "docker logs nextcloud" -->
@@ -1,77 +0,0 @@
-# Based on the issue template
-name: Bug report
-description: Create a report to help us improve
-title: "[BUG] <title>"
-labels: [Bug]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: Tell us what happens instead of the expected behavior.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: Tell us what should happen.
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Steps To Reproduce
-      description: Steps to reproduce the behavior.
-      placeholder: |
-        1. In this environment...
-        2. With this config...
-        3. Run '...'
-        4. See error...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment
-      description: |
-        examples:
-          - **OS**: Ubuntu 20.04
-          - **How docker service was installed**: distro's packagemanager
-      value: |
-        - OS:
-        - How docker service was installed:
-      render: markdown
-    validations:
-      required: false
-  - type: dropdown
-    attributes:
-      label: CPU architecture
-      options:
-        - x86-64
-        - arm64
-        - armhf
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Docker creation
-      description: |
-        Command used to create docker container
-        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
-      render: bash
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
-      label: Container logs
-      placeholder: |
-        Output of `docker logs linuxserver.io`
-      render: bash
-    validations:
-      required: true
@@ -0,0 +1,25 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+[linuxserverurl]: https://linuxserver.io
+[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
+
+<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
+
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
+<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
+
+<!--- Provide a general summary of the request in the Title above -->
+
+------------------------------
+
+## Desired Behavior
+<!--- Tell us what should happen -->
+
+## Current Behavior
+<!--- Tell us what happens instead of the expected behavior -->
+
+## Alternatives Considered
+<!--- Tell us what other options you have tried or considered -->
@@ -1,31 +0,0 @@
-# Based on the issue template
-name: Feature request
-description: Suggest an idea for this project
-title: "[FEAT] <title>"
-labels: [enhancement]
-body:
-  - type: checkboxes
-    attributes:
-      label: Is this a new feature request?
-      description: Please search to see if a feature request already exists.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Wanted change
-      description: Tell us what you want to happen.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reason for change
-      description: Justify your request, why do you want it, what is the benefit.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Proposed code change
-      description: Do you have a potential code change in mind?
-    validations:
-      required: false
@@ -21,7 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

 ------------------------------

@@ -1,14 +0,0 @@
-name: Issue & PR Tracker
-
-on:
-  issues:
-    types: [opened,reopened,labeled,unlabeled]
-  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
-
-jobs:
-  manage-project:
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
-    secrets: inherit
@@ -1,13 +0,0 @@
-name: Mark stale issues and pull requests
-on:
-  schedule:
-    - cron:  '35 2 * * *'
-  workflow_dispatch:
-
-jobs:
-  stale:
-    permissions:
-      issues: write
-      pull-requests: write
-    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
-    secrets: inherit
@@ -4,24 +4,24 @@ on:
  workflow_dispatch:

 jobs:
-  external-trigger-master:
+  external-trigger-php8:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3

      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/php8'
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_PHP8 }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_PHP8 is set; skipping trigger. ****"
            exit 0
          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\". ****"
+          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 -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 master"
+            FAILURE_REASON="Can't retrieve external version for nextcloud branch php8"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-nextcloud/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -32,7 +32,7 @@ jobs:
          echo "**** External version: ${EXT_RELEASE} ****"
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/nextcloud"
-          tag="latest"
+          tag="php8"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fnextcloud%3Apull" \
            | jq -r '.token')
@@ -48,17 +48,13 @@ jobs:
              | jq -r '.config.digest')
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}")
-          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
-            image_info=$(echo $image_info | jq -r '.config')
-          else
-            image_info=$(echo $image_info | jq -r '.container_config')
-          fi
+            "https://ghcr.io/v2/${image}/blobs/${digest}" \
+            | jq -r '.container_config')
          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag latest"
+            FAILURE_REASON="Can't retrieve last pushed version for nextcloud tag php8"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -68,13 +64,13 @@ jobs:
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/php8/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
            exit 0
          else
            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/php8/buildWithParameters?PACKAGE_CHECK=false \
              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
            echo "**** Sleeping 10 seconds until job starts ****"
@@ -89,7 +85,7 @@ jobs:
              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
              --data-urlencode "Submit=Submit"
            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for nextcloud tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for nextcloud tag php8. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -9,7 +9,7 @@ jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
        with:
          fetch-depth: '0'

@@ -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 relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        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)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -4,25 +4,25 @@ on:
  workflow_dispatch:

 jobs:
-  package-trigger-master:
+  package-trigger-php8:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3

      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/php8'
        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_PHP8 }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_PHP8 is set; skipping trigger. ****"
            exit 0
          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/php8/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
            exit 0
          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\". ****"
+          echo "**** Package trigger running off of php8 branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_PHP8\". ****"
          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/php8/buildWithParameters?PACKAGE_CHECK=true \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
          echo "**** Sleeping 10 seconds until job starts ****"
@@ -2,14 +2,14 @@ name: Package Trigger Scheduler

 on:
  schedule:
-    - cron:  '42 11 * * 2'
+    - cron:  '13 15 * * 0'
  workflow_dispatch:

 jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
        with:
          fetch-depth: '0'

@@ -1,10 +0,0 @@
-name: Permission check
-on:
-  pull_request_target:
-    paths:
-      - '**/run'
-      - '**/finish'
-      - '**/check'
-jobs:
-  permission_check:
-    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'
+        days-before-stale: 30
+        days-before-close: 365
+        exempt-issue-labels: 'awaiting-approval,work-in-progress'
+        exempt-pr-labels: 'awaiting-approval,work-in-progress'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,6 +1,4 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14-php8

 # set version label
 ARG BUILD_DATE
@@ -10,52 +8,76 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"

 # environment settings
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
+ENV \
+  NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies --upgrade \
+    autoconf \
+    automake \
+    file \
+    g++ \
+    gcc \
+    make \
+    php8-dev \
+    re2c \
+    samba-dev \
+    zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
+    curl \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-opcache \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-apcu \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xmlreader \
+    php8-zip \
    samba-client \
-    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
+    sudo \
+    tar \
+    unzip && \
+  echo "**** compile smbclient ****" && \
+  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
+  cd /tmp/smbclient && \
+  phpize8 && \
+  ./configure \
+    --with-php-config=/usr/bin/php-config8 && \
+  make && \
+  make install && \
  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
+  echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \
+  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=16/g' \
@@ -68,12 +90,11 @@ RUN \
    -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
    -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
    -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
+    /etc/php8/php.ini && \
  sed -i \
    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
+    /etc/php8/php.ini && \
+  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 -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -83,10 +104,9 @@ RUN \
  echo "**** download nextcloud ****" && \
  curl -o /app/nextcloud.tar.bz2 -L \
    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
  rm -rf \
    /tmp/*

@@ -94,5 +114,5 @@ RUN \
 COPY root/ /

 # ports and volumes
-EXPOSE 80 443
-VOLUME /config
+EXPOSE 443
+VOLUME /config /data
@@ -1,6 +1,4 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14-php8

 # set version label
 ARG BUILD_DATE
@@ -10,52 +8,76 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"

 # environment settings
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
+ENV \
+  NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies --upgrade \
+    autoconf \
+    automake \
+    file \
+    g++ \
+    gcc \
+    make \
+    php8-dev \
+    re2c \
+    samba-dev \
+    zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
+    curl \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-opcache \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-apcu \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xmlreader \
+    php8-zip \
    samba-client \
-    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
+    sudo \
+    tar \
+    unzip && \
+  echo "**** compile smbclient ****" && \
+  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
+  cd /tmp/smbclient && \
+  phpize8 && \
+  ./configure \
+    --with-php-config=/usr/bin/php-config8 && \
+  make && \
+  make install && \
  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
+  echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \
+  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=16/g' \
@@ -68,12 +90,11 @@ RUN \
    -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
    -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
    -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
+    /etc/php8/php.ini && \
  sed -i \
    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
+    /etc/php8/php.ini && \
+  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 -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -83,10 +104,9 @@ RUN \
  echo "**** download nextcloud ****" && \
  curl -o /app/nextcloud.tar.bz2 -L \
    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
  rm -rf \
    /tmp/*

@@ -94,5 +114,5 @@ RUN \
 COPY root/ /

 # ports and volumes
-EXPOSE 80 443
-VOLUME /config
+EXPOSE 443
+VOLUME /config /data
@@ -1,6 +1,4 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14-php8

 # set version label
 ARG BUILD_DATE
@@ -10,55 +8,79 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="aptalca"

 # environment settings
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
+ENV \
+  NEXTCLOUD_PATH="/config/www/nextcloud" \
+  LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies --upgrade \
+    autoconf \
+    automake \
+    file \
+    g++ \
+    gcc \
+    make \
+    php8-dev \
+    re2c \
+    samba-dev \
+    zlib-dev && \
  echo "**** install runtime packages ****" && \
  apk add --no-cache --upgrade \
+    curl \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
    libxml2 \
-    php81-apcu \
-    php81-bcmath \
-    php81-bz2 \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-exif \
-    php81-ftp \
-    php81-gd \
-    php81-gmp \
-    php81-iconv \
-    php81-imap \
-    php81-intl \
-    php81-ldap \
-    php81-opcache \
-    php81-pcntl \
-    php81-pdo_mysql \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pecl-imagick \
-    php81-pecl-memcached \
-    php81-pgsql \
-    php81-phar \
-    php81-posix \
-    php81-redis \
-    php81-sodium \
-    php81-sqlite3 \
-    php81-sysvsem \
-    php81-xmlreader \
-    php81-zip \
+    php8-bcmath \
+    php8-bz2 \
+    php8-ctype \
+    php8-curl \
+    php8-dom \
+    php8-exif \
+    php8-fileinfo \
+    php8-ftp \
+    php8-gd \
+    php8-gmp \
+    php8-iconv \
+    php8-imap \
+    php8-intl \
+    php8-ldap \
+    php8-opcache \
+    php8-pcntl \
+    php8-pdo_mysql \
+    php8-pdo_pgsql \
+    php8-pdo_sqlite \
+    php8-pecl-apcu \
+    php8-pecl-imagick \
+    php8-pecl-mcrypt \
+    php8-pecl-memcached \
+    php8-pgsql \
+    php8-phar \
+    php8-posix \
+    php8-redis \
+    php8-sodium \
+    php8-sqlite3 \
+    php8-xmlreader \
+    php8-zip \
    samba-client \
-    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
+    sudo \
+    tar \
+    unzip && \
+  echo "**** compile smbclient ****" && \
+  git clone https://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \
+  cd /tmp/smbclient && \
+  phpize8 && \
+  ./configure \
+    --with-php-config=/usr/bin/php-config8 && \
+  make && \
+  make install && \
  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/conf.d/apcu.ini && \
+  echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \
+  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=16/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' \
@@ -68,12 +90,11 @@ RUN \
    -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \
    -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \
    -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \
-    -e 's/output_buffering.*=.*/output_buffering=0/g' \
-      /etc/php81/php.ini && \
+    /etc/php8/php.ini && \
  sed -i \
    '/opcache.enable=1/a opcache.enable_cli=1' \
-      /etc/php81/php.ini && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
+    /etc/php8/php.ini && \
+  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 -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
@@ -83,10 +104,9 @@ RUN \
  echo "**** download nextcloud ****" && \
  curl -o /app/nextcloud.tar.bz2 -L \
    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
  echo "**** cleanup ****" && \
+  apk del --purge \
+    build-dependencies && \
  rm -rf \
    /tmp/*

@@ -94,5 +114,5 @@ RUN \
 COPY root/ /

 # ports and volumes
-EXPOSE 80 443
-VOLUME /config
+EXPOSE 443
+VOLUME /config /data
@@ -42,7 +42,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':php8 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
            returnStdout: true).trim()
          env.LS_RELEASE_NOTES = sh(
            script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -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.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -144,10 +144,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a php8 build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -157,20 +157,20 @@ 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-php8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-php8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-php8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'php8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'php8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'php8-version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "php8"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -180,13 +180,13 @@ 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-php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-php8-' + 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
+            env.CI_TAGS = 'php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'php8-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -203,13 +203,13 @@ 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-php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'php8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'php8-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/'
        }
@@ -230,21 +230,24 @@ pipeline {
          }
          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
+                set -e
+                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                docker run --rm \
-                  -v ${WORKSPACE}:/mnt \
-                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
-                    pip install s3cmd && \
-                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
+                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
+                -e FILE_NAME="shellcheck-result.xml" \
+                -e MIMETYPE="text/xml" \
+                -v ${WORKSPACE}:/mnt \
+                -e SECRET_KEY=\"${S3_SECRET}\" \
+                -e ACCESS_KEY=\"${S3_KEY}\" \
+                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                python /upload.py'''
        }
      }
    }
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -255,13 +258,13 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=php8 -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
              # Stage 1 - Jenkinsfile update
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f php8
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
@@ -274,7 +277,7 @@ pipeline {
                echo "Jenkinsfile is up to date."
              fi
              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -284,14 +287,14 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f php8
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old templates"
                rm -Rf ${TEMPDIR}
                exit 0
              else
@@ -305,7 +308,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f php8
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -363,7 +366,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -402,7 +405,7 @@ pipeline {
    // Add package to Scarf.sh and set permissions
    stage("Scarf.sh package registry"){
      when {
-        branch "master"
+        branch "php8"
        environment name: 'EXIT_STATUS', value: ''
      }
      steps{
@@ -439,8 +442,7 @@ pipeline {
      }
      steps {
        echo "Running on node: ${NODE_NAME}"
-        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-        sh "docker buildx build \
+        sh "docker build \
          --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
          --label \"org.opencontainers.image.authors=linuxserver.io\" \
          --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nextcloud/packages\" \
@@ -453,7 +455,7 @@ pipeline {
          --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
          --label \"org.opencontainers.image.title=Nextcloud\" \
          --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
-          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
@@ -470,8 +472,7 @@ pipeline {
        stage('Build X86') {
          steps {
            echo "Running on node: ${NODE_NAME}"
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-            sh "docker buildx build \
+            sh "docker build \
              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nextcloud/packages\" \
@@ -484,7 +485,7 @@ pipeline {
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Nextcloud\" \
              --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
-              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@@ -498,8 +499,7 @@ pipeline {
            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 \
+            sh "docker build \
              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nextcloud/packages\" \
@@ -512,7 +512,7 @@ pipeline {
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Nextcloud\" \
              --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
+              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
@@ -533,8 +533,7 @@ pipeline {
            sh '''#! /bin/bash
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
-            sh "docker buildx build \
+            sh "docker build \
              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
              --label \"org.opencontainers.image.authors=linuxserver.io\" \
              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nextcloud/packages\" \
@@ -547,7 +546,7 @@ pipeline {
              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
              --label \"org.opencontainers.image.title=Nextcloud\" \
              --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
-              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
@@ -563,7 +562,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -576,17 +575,31 @@ pipeline {
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
              fi
-              touch ${TEMPDIR}/package_versions.txt
-              docker run --rm \
-                -v /var/run/docker.sock:/var/run/docker.sock:ro \
-                -v ${TEMPDIR}:/tmp \
-                ghcr.io/anchore/syft:latest \
-                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apk info -v > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "fedora" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  rpm -qa > /tmp/package_versions.txt && \
+                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "arch" ]; then
+                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+                  pacman -Q > /tmp/package_versions.txt && \
+                  chmod 777 /tmp/package_versions.txt'
+              fi
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f php8
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -610,7 +623,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@@ -631,7 +644,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "master"
+        branch "php8"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -697,7 +710,7 @@ pipeline {
                -e DO_REGION="ams3" \
                -e DO_BUCKET="lsio-ci" \
                -t ghcr.io/linuxserver/ci:latest \
-                python3 test_build.py'''
+                python /ci/ci.py'''
        }
      }
    }
@@ -734,12 +747,12 @@ pipeline {
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:php8
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
                    fi
-                    docker push ${PUSHIMAGE}:latest
+                    docker push ${PUSHIMAGE}:php8
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
@@ -753,7 +766,7 @@ pipeline {
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
+                  ${DELETEIMAGE}:php8 || :
                  if [ -n "${SEMVER}" ]; then
                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
                  fi
@@ -792,19 +805,19 @@ pipeline {
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  if [ "${CI}" == "false" ]; then
                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker 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:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker tag ${IMAGE}: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}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-php8
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-php8
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-php8
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
@@ -812,23 +825,23 @@ pipeline {
                      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}:amd64-php8
+                    docker push ${MANIFESTIMAGE}:arm32v7-php8
+                    docker push ${MANIFESTIMAGE}:arm64v8-php8
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    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 annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:php8 || :
+                    docker manifest create ${MANIFESTIMAGE}:php8 ${MANIFESTIMAGE}:amd64-php8 ${MANIFESTIMAGE}:arm32v7-php8 ${MANIFESTIMAGE}:arm64v8-php8
+                    docker manifest annotate ${MANIFESTIMAGE}:php8 ${MANIFESTIMAGE}:arm32v7-php8 --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:php8 ${MANIFESTIMAGE}:arm64v8-php8 --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
@@ -843,7 +856,7 @@ pipeline {
                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
+                    docker manifest push --purge ${MANIFESTIMAGE}:php8
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
                    if [ -n "${SEMVER}" ]; then
@@ -856,13 +869,13 @@ pipeline {
                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-php8 \
                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-php8 \
                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
+                  ${DELETEIMAGE}:arm64v8-php8 \
                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
                  if [ -n "${SEMVER}" ]; then
                    docker rmi \
@@ -881,7 +894,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "php8"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -893,17 +906,17 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to php8",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "php8",\
                     "name": "'${META_TAG}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+              printf '","draft": false,"prerelease": true}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
@@ -964,12 +977,12 @@ pipeline {
          sh 'echo "build aborted"'
        }
        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-nextcloud/blob/php8/.github/CONTRIBUTING.md -->

 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

@@ -37,7 +37,7 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nextcloud)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/nextcloud)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-nextcloud%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-nextcloud%2Fjob%2Fphp8%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/php8/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fnextcloud%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/nextcloud/latest/index.html)

 [Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.
@@ -50,7 +50,7 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch

 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:latest` 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:

@@ -58,7 +58,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf| ✅ | arm32v7-\<version tag\> |

 ## Application Setup

@@ -76,7 +76,7 @@ Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u

 If you are not customizing our default nginx configuration you will need to remove the file:
 ```
-/config/nginx/site-confs/default.conf
+/config/nginx/site-confs/default
 ```
 Then restart the container to replace it with the latest one. 

@@ -86,11 +86,6 @@ Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffi

 If (auto) installed, those built-in packages may cause instability and should be removed.

-### Strict reverse proxies
-
-This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
-If you are using a reverse proxy which validates certificates, you need to [disable this check for the container](https://docs.linuxserver.io/faq#strict-proxy).
-
 ## Usage

 Here are some example snippets to help you get started creating a container.
@@ -102,12 +97,12 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: lscr.io/linuxserver/nextcloud:php8
    container_name: nextcloud
    environment:
      - PUID=1000
      - PGID=1000
-      - TZ=Etc/UTC
+      - TZ=Europe/London
    volumes:
      - /path/to/appdata:/config
      - /path/to/data:/data
@@ -123,13 +118,12 @@ docker run -d \
  --name=nextcloud \
  -e PUID=1000 \
  -e PGID=1000 \
-  -e TZ=Etc/UTC \
+  -e TZ=Europe/London \
  -p 443:443 \
  -v /path/to/appdata:/config \
  -v /path/to/data:/data \
  --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud:latest
-
+  lscr.io/linuxserver/nextcloud:php8
 ```

 ## Parameters
@@ -141,7 +135,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 443` | WebUI |
 | `-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 TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
 | `-v /config` | Nextcloud configs. |
 | `-v /data` | Your personal data. |

@@ -188,7 +182,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:latest`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:php8`

 ## Updating Info

@@ -206,7 +200,7 @@ Below are the instructions for updating containers:

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/nextcloud:latest`
+* 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)
@@ -241,7 +235,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`
@@ -254,30 +248,24 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **21.03.23:** - Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``.
-* **02.03.23:** - Set permissions on crontabs during init.
-* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
-* **10.10.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
-* **30.09.22:** - Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html
-* **21.05.22:** - Update version check endpoint.
-* **28.04.22:** - Increase OPCache interned strings buffered setting to 16.
-* **14.04.22:** - Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection.
-* **11.09.21:** - Rebasing to alpine 3.14
-* **21.03.21:** - Publish `php8` tag for testing.
-* **25.02.21:** - Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **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.
+* **25.02.21:** - Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **21.01.21:** - Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup.
-* **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **20.01.21:** - Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **16.01.21:** - Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13).
-* **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **12.08.20:** - Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **03.06.20:** - Rebasing to alpine 3.12
 * **03.06.20:** - Add php7-bcmath and php7-fileinfo
 * **31.05.20:** - Add aliases for occ and updater.phar
 * **31.03.20:** - Allow crontab to be user customized, fix logrotate.
-* **17.01.20:** - Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **17.01.20:** - Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **19.12.19:** - Rebasing to alpine 3.11.
-* **18.11.19:** - Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **18.11.19:** - Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **28.10.19:** - Change cronjob to run every 5 minutes.
-* **24.10.19:** - Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container).
+* **24.10.19:** - Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container).
 * **14.07.19:** - Download nextcloud during build time.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
@@ -4,9 +4,9 @@
 project_name: docker-nextcloud
 external_type: na
 custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest | jq -r '. | .tag_name' | sed 's|^v||'"
-release_type: stable
-release_tag: latest
-ls_branch: master
+release_type: prerelease
+release_tag: php8
+ls_branch: php8
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
  - LS_USER = 'linuxserver'
@@ -1,235 +1,215 @@
-NAME                    VERSION                TYPE   
-alpine-baselayout       3.4.0-r0               apk     
-alpine-baselayout-data  3.4.0-r0               apk     
-alpine-keys             2.4-r1                 apk     
-alpine-release          3.17.2-r0              apk     
-alsa-lib                1.2.8-r0               apk     
-aom-libs                3.5.0-r0               apk     
-apache2-utils           2.4.56-r0              apk     
-apk-tools               2.12.10-r1             apk     
-apr                     1.7.2-r0               apk     
-apr-util                1.6.3-r0               apk     
-argon2-libs             20190702-r2            apk     
-avahi-libs              0.8-r6                 apk     
-bash                    5.2.15-r0              apk     
-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     
-c-client                2007f-r14              apk     
-ca-certificates         20220614-r4            apk     
-ca-certificates-bundle  20220614-r4            apk     
-cairo                   1.17.6-r3              apk     
-cairo-gobject           1.17.6-r3              apk     
-cjson                   1.7.15-r3              apk     
-coreutils               9.1-r0                 apk     
-cups-libs               2.4.2-r1               apk     
-curl                    7.88.1-r1              apk     
-dbus-libs               1.14.4-r0              apk     
-ffmpeg                  5.1.3-r0               apk     
-ffmpeg-libs             5.1.3-r0               apk     
-flac-libs               1.4.2-r0               apk     
-fontconfig              2.14.1-r0              apk     
-freetype                2.12.1-r0              apk     
-fribidi                 1.0.12-r0              apk     
-gdbm                    1.23-r0                apk     
-gdk-pixbuf              2.42.10-r0             apk     
-ghostscript             10.0.0-r0              apk     
-git                     2.38.4-r1              apk     
-glib                    2.74.6-r0              apk     
-gmp                     6.2.1-r2               apk     
-gnu-libiconv            1.17-r0                apk     
-gnu-libiconv-libs       1.17-r0                apk     
-gnutls                  3.7.8-r3               apk     
-graphite2               1.3.14-r2              apk     
-harfbuzz                5.3.1-r1               apk     
-hwdata-pci              0.364-r0               apk     
-icu-data-en             72.1-r1                apk     
-icu-libs                72.1-r1                apk     
-imagemagick             7.1.0.52-r0            apk     
-imagemagick-libs        7.1.0.52-r0            apk     
-jansson                 2.14-r0                apk     
-jbig2dec                0.19-r1                apk     
-jq                      1.6-r2                 apk     
-lame                    3.100-r2               apk     
-lcms2                   2.14-r0                apk     
-ldb                     2.5.3-r0               apk     
-libacl                  2.3.1-r1               apk     
-libarchive              3.6.1-r2               apk     
-libass                  0.16.0-r1              apk     
-libasyncns              0.8-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     
-libcap2                 2.66-r0                apk     
-libcrypto3              3.0.8-r3               apk     
-libcurl                 7.88.1-r1              apk     
-libdav1d                1.0.0-r2               apk     
-libde265                1.0.11-r1              apk     
-libdrm                  2.4.114-r0             apk     
-libedit                 20221030.3.1-r0        apk     
-libexpat                2.5.0-r0               apk     
-libffi                  3.4.4-r0               apk     
-libgcc                  12.2.1_git20220924-r4  apk     
-libgomp                 12.2.1_git20220924-r4  apk     
-libheif                 1.13.0-r0              apk     
-libice                  1.0.10-r1              apk     
-libintl                 0.21.1-r1              apk     
-libjpeg-turbo           2.1.4-r0               apk     
-libjxl                  0.7.0-r0               apk     
-libldap                 2.6.3-r6               apk     
-libltdl                 2.4.7-r1               apk     
-libmcrypt               2.5.8-r10              apk     
-libmd                   1.0.4-r0               apk     
-libmemcached-libs       1.0.18-r5              apk     
-libmount                2.38.1-r1              apk     
-libogg                  1.3.5-r2               apk     
-libpciaccess            0.17-r0                apk     
-libpng                  1.6.38-r0              apk     
-libpq                   15.2-r0                apk     
-libproc                 3.3.17-r2              apk     
-libpulse                16.1-r6                apk     
-librist                 0.2.7-r0               apk     
-librsvg                 2.55.1-r0              apk     
-libsasl                 2.1.28-r3              apk     
-libsm                   1.2.3-r1               apk     
-libsmbclient            4.16.10-r0             apk     
-libsndfile              1.1.0-r2               apk     
-libsodium               1.0.18-r2              apk     
-libsrt                  1.5.1-r0               apk     
-libssh                  0.10.4-r0              apk     
-libssl3                 3.0.8-r3               apk     
-libstdc++               12.2.1_git20220924-r4  apk     
-libtasn1                4.19.0-r0              apk     
-libtheora               1.1.1-r16              apk     
-libunistring            1.1-r0                 apk     
-libuuid                 2.38.1-r1              apk     
-libva                   2.16.0-r0              apk     
-libvdpau                1.5-r0                 apk     
-libvorbis               1.3.7-r0               apk     
-libvpx                  1.12.0-r1              apk     
-libwbclient             4.16.10-r0             apk     
-libwebp                 1.2.4-r1               apk     
-libx11                  1.8.4-r0               apk     
-libxau                  1.0.10-r0              apk     
-libxcb                  1.15-r0                apk     
-libxdmcp                1.1.4-r0               apk     
-libxext                 1.3.5-r0               apk     
-libxfixes               6.0.0-r0               apk     
-libxft                  2.3.7-r0               apk     
-libxml2                 2.10.3-r1              apk     
-libxpm                  3.5.15-r0              apk     
-libxrender              0.9.11-r0              apk     
-libxt                   1.2.1-r0               apk     
-libzip                  1.9.2-r2               apk     
-libzmq                  4.3.4-r1               apk     
-linux-pam               1.5.2-r1               apk     
-lmdb                    0.9.29-r2              apk     
-logrotate               3.20.1-r3              apk     
-lz4-libs                1.9.4-r1               apk     
-mbedtls                 2.28.3-r0              apk     
-musl                    1.2.3-r4               apk     
-musl-utils              1.2.3-r4               apk     
-nano                    7.0-r0                 apk     
-ncurses-libs            6.3_p20221119-r0       apk     
-ncurses-terminfo-base   6.3_p20221119-r0       apk     
-netcat-openbsd          1.130-r4               apk     
-nettle                  3.8.1-r0               apk     
-nghttp2-libs            1.51.0-r0              apk     
-nginx                   1.22.1-r0              apk     
-numactl                 2.0.16-r1              apk     
-oniguruma               6.9.8-r0               apk     
-openssl                 3.0.8-r3               apk     
-opus                    1.3.1-r1               apk     
-orc                     0.4.33-r0              apk     
-p11-kit                 0.24.1-r1              apk     
-pango                   1.50.13-r0             apk     
-pcre                    8.45-r2                apk     
-pcre2                   10.42-r0               apk     
-php-cli                 8.1.17                 binary  
-php-fpm                 8.1.17                 binary  
-php81                   8.1.17-r0              apk     
-php81-bcmath            8.1.17-r0              apk     
-php81-bz2               8.1.17-r0              apk     
-php81-common            8.1.17-r0              apk     
-php81-ctype             8.1.17-r0              apk     
-php81-curl              8.1.17-r0              apk     
-php81-dom               8.1.17-r0              apk     
-php81-exif              8.1.17-r0              apk     
-php81-fileinfo          8.1.17-r0              apk     
-php81-fpm               8.1.17-r0              apk     
-php81-ftp               8.1.17-r0              apk     
-php81-gd                8.1.17-r0              apk     
-php81-gmp               8.1.17-r0              apk     
-php81-iconv             8.1.17-r0              apk     
-php81-imap              8.1.17-r0              apk     
-php81-intl              8.1.17-r0              apk     
-php81-ldap              8.1.17-r0              apk     
-php81-mbstring          8.1.17-r0              apk     
-php81-mysqlnd           8.1.17-r0              apk     
-php81-opcache           8.1.17-r0              apk     
-php81-openssl           8.1.17-r0              apk     
-php81-pcntl             8.1.17-r0              apk     
-php81-pdo               8.1.17-r0              apk     
-php81-pdo_mysql         8.1.17-r0              apk     
-php81-pdo_pgsql         8.1.17-r0              apk     
-php81-pdo_sqlite        8.1.17-r0              apk     
-php81-pecl-apcu         5.1.22-r0              apk     
-php81-pecl-igbinary     3.2.12-r0              apk     
-php81-pecl-imagick      3.7.0-r0               apk     
-php81-pecl-mcrypt       1.0.6-r0               apk     
-php81-pecl-memcached    3.2.0-r0               apk     
-php81-pecl-redis        5.3.7-r0               apk     
-php81-pecl-smbclient    1.0.6-r1               apk     
-php81-pgsql             8.1.17-r0              apk     
-php81-phar              8.1.17-r0              apk     
-php81-posix             8.1.17-r0              apk     
-php81-session           8.1.17-r0              apk     
-php81-simplexml         8.1.17-r0              apk     
-php81-sodium            8.1.17-r0              apk     
-php81-sqlite3           8.1.17-r0              apk     
-php81-sysvsem           8.1.17-r0              apk     
-php81-xml               8.1.17-r0              apk     
-php81-xmlreader         8.1.17-r0              apk     
-php81-xmlwriter         8.1.17-r0              apk     
-php81-zip               8.1.17-r0              apk     
-pixman                  0.42.2-r0              apk     
-pkgconf                 1.9.4-r0               apk     
-popt                    1.19-r0                apk     
-procps                  3.3.17-r2              apk     
-readline                8.2.0-r0               apk     
-samba-client            4.16.10-r0             apk     
-samba-client-libs       4.16.10-r0             apk     
-samba-common            4.16.10-r0             apk     
-samba-libs              4.16.10-r0             apk     
-samba-util-libs         4.16.10-r0             apk     
-scanelf                 1.3.5-r1               apk     
-sdl2                    2.26.3-r0              apk     
-shadow                  4.13-r0                apk     
-shared-mime-info        2.2-r2                 apk     
-skalibs                 2.12.0.1-r0            apk     
-soxr                    0.1.3-r3               apk     
-speexdsp                1.2.1-r0               apk     
-sqlite-libs             3.40.1-r0              apk     
-ssl_client              1.35.0-r29             apk     
-sudo                    1.9.12_p2-r1           apk     
-svt-av1-libs            1.3.0-r0               apk     
-talloc                  2.3.4-r0               apk     
-tdb-libs                1.4.6-r0               apk     
-tevent                  0.13.0-r0              apk     
-tiff                    4.4.0-r3               apk     
-tzdata                  2023b-r1               apk     
-utmps-libs              0.1.2.0-r1             apk     
-v4l-utils-libs          1.22.1-r2              apk     
-vidstab                 1.1.0-r2               apk     
-wayland-libs-client     1.21.0-r1              apk     
-x264-libs               0.164_git20220602-r0   apk     
-x265-libs               3.5-r3                 apk     
-xvidcore                1.3.7-r1               apk     
-xz                      5.2.9-r0               apk     
-xz-libs                 5.2.9-r0               apk     
-zlib                    1.2.13-r0              apk     
-zstd-libs               1.5.2-r9               apk     
+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.54-r0
+apk-tools-2.12.7-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-r8
+c-client-2007f-r11
+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-r3
+curl-7.79.1-r3
+dbus-libs-1.12.20-r2
+expat-2.4.7-r0
+ffmpeg-4.4.1-r0
+ffmpeg-libs-4.4.1-r0
+fontconfig-2.13.1-r4
+freetype-2.10.4-r3
+fribidi-1.0.10-r0
+gdbm-1.19-r0
+gdk-pixbuf-2.42.6-r1
+ghostscript-9.54.0-r1
+git-2.32.3-r0
+glib-2.68.3-r0
+gmp-6.2.1-r1
+gnu-libiconv-1.16-r0
+gnutls-3.7.1-r1
+graphite2-1.3.14-r0
+harfbuzz-2.8.1-r0
+icu-libs-67.1-r2
+imagemagick-7.0.11.14-r1
+imagemagick-libs-7.0.11.14-r1
+jansson-2.13.1-r0
+jbig2dec-0.19-r0
+lame-3.100-r0
+lcms2-2.12-r1
+ldb-2.3.3-r0
+libacl-2.2.53-r0
+libarchive-3.5.3-r0
+libass-0.15.1-r0
+libattr-2.5.1-r0
+libblkid-2.37.4-r0
+libbsd-0.11.3-r0
+libbz2-1.0.8-r1
+libc-utils-0.7.2-r3
+libcap-2.50-r0
+libcrypto1.1-1.1.1q-r0
+libcurl-7.79.1-r3
+libdav1d-0.9.0-r0
+libde265-1.0.8-r2
+libdrm-2.4.106-r0
+libedit-20210216.3.1-r0
+libffi-3.3-r2
+libgcc-10.3.1_git20210424-r2
+libgomp-10.3.1_git20210424-r2
+libheif-1.12.0-r0
+libice-1.0.10-r0
+libintl-0.21-r0
+libjpeg-turbo-2.1.0-r0
+libldap-2.4.58-r0
+libltdl-2.4.6-r7
+libmagic-5.40-r1
+libmcrypt-2.5.8-r9
+libmd-1.0.3-r0
+libmemcached-libs-1.0.18-r4
+libmount-2.37.4-r0
+libogg-1.3.5-r0
+libpciaccess-0.16-r0
+libpng-1.6.37-r1
+libpq-13.8-r0
+libproc-3.3.17-r0
+libressl3.3-libcrypto-3.3.6-r0
+libressl3.3-libssl-3.3.6-r0
+libretls-3.3.3p1-r3
+librsvg-2.50.4-r1
+libsasl-2.1.28-r0
+libsm-1.2.3-r0
+libsmbclient-4.14.12-r0
+libsodium-1.0.18-r0
+libsrt-1.4.2-r0
+libssh-0.9.6-r0
+libssl1.1-1.1.1q-r0
+libstdc++-10.3.1_git20210424-r2
+libtasn1-4.17.0-r0
+libtheora-1.1.1-r16
+libunistring-0.9.10-r1
+libuuid-2.37.4-r0
+libva-2.11.0-r0
+libvdpau-1.4-r0
+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
+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.14-r1
+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-r3
+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-r1
+ncurses-terminfo-base-6.2_p20210612-r1
+nettle-3.7.3-r0
+nghttp2-libs-1.43.0-r0
+nginx-1.20.2-r1
+oniguruma-6.9.7.1-r0
+openssl-1.1.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-r1
+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
+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-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-simplexml-8.0.13-r0
+php8-sodium-8.0.13-r0
+php8-sqlite3-8.0.13-r0
+php8-xml-8.0.13-r0
+php8-xmlreader-8.0.13-r0
+php8-xmlwriter-8.0.13-r0
+php8-zip-8.0.13-r0
+pixman-0.40.0-r2
+pkgconf-1.7.4-r0
+popt-1.18-r0
+procps-3.3.17-r0
+readline-8.1.0-r0
+s6-ipcserver-2.10.0.3-r0
+samba-client-4.14.12-r0
+samba-client-libs-4.14.12-r0
+samba-common-4.14.12-r0
+samba-libs-4.14.12-r0
+samba-util-libs-4.14.12-r0
+scanelf-1.3.2-r0
+sdl2-2.0.14-r1
+shadow-4.8.1-r0
+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-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.3.0-r0
+tzdata-2022c-r0
+unzip-6.0-r9
+utmps-0.1.0.2-r0
+v4l-utils-libs-1.20.0-r0
+vidstab-1.1.0-r1
+vulkan-loader-1.2.170-r1
+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-r1
+xz-libs-5.2.5-r1
+zlib-1.2.12-r3
+zstd-libs-1.4.9-r1
@@ -19,8 +19,6 @@ available_architectures:

 # development version
 development_versions: false
-development_versions_items:
-  - { tag: "latest", desc: "Stable Nextcloud releases" }

 # container parameters
 common_param_env_vars_enabled: true
@@ -64,7 +62,7 @@ app_setup_block: |
  
  If you are not customizing our default nginx configuration you will need to remove the file:
  ```
-  /config/nginx/site-confs/default.conf
+  /config/nginx/site-confs/default
  ```
  Then restart the container to replace it with the latest one. 

@@ -77,30 +75,24 @@ app_setup_block: |

 # changelog
 changelogs:
-  - { date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``." }
-  - { date: "02.03.23:", desc: "Set permissions on crontabs during init." }
-  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
-  - { date: "10.10.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: "30.09.22:", desc: "Disabled `output_buffering` as per [nextcloud docs](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/big_file_upload_configuration.html" }
-  - { date: "21.05.22:", desc: "Update version check endpoint." }
-  - { date: "28.04.22:", desc: "Increase OPCache interned strings buffered setting to 16." }
-  - { date: "14.04.22:", desc: "Nginx default site config updated for v23 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container). Fix LDAP connection." }
-  - { date: "11.09.21:", desc: "Rebasing to alpine 3.14" }
-  - { date: "21.03.21:", desc: "Publish `php8` tag for testing." }
-  - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { 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." }
+  - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "21.01.21:", desc: "Fix php iconv (was breaking the mail addon). If installed, attempt to remove broken CODE Server app during startup." }
-  - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { date: "20.01.21:", desc: "Increase php fcgi timeout to prevent 504 Gateway timeout errors (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "16.01.21:", desc: "Rebasing to alpine 3.13. Users with issues on 32-bit arm, [see this article](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal-and-alpine-3-13)." }
-  - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { date: "12.08.20:", desc: "Various updates to default site config, including added support for webfinger (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "03.06.20:", desc: "Rebasing to alpine 3.12" }
  - { date: "03.06.20:", desc: "Add php7-bcmath and php7-fileinfo" }
  - { date: "31.05.20:", desc: "Add aliases for occ and updater.phar" }
  - { date: "31.03.20:", desc: "Allow crontab to be user customized, fix logrotate." }
-  - { date: "17.01.20:", desc: "Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { date: "17.01.20:", desc: "Updated php.ini defaults and site config, including an optional HSTS directive (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
-  - { date: "18.11.19:", desc: "Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { date: "18.11.19:", desc: "Nginx default site config updated for v17 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "28.10.19:", desc: "Change cronjob to run every 5 minutes." }
-  - { date: "24.10.19:", desc: "Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default.conf` and restart the container)." }
+  - { date: "24.10.19:", desc: "Nginx default site config updated due to CVE-2019-11043 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." }
  - { date: "14.07.19:", desc: "Download nextcloud during build time." }
  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
@@ -1,29 +1,31 @@
-## Version 2023/03/21 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
-
-# Set the `immutable` cache control options only for assets with a cache busting `v` argument
-map $arg_v $asset_immutable {
-    "" "";
-    default "immutable";
+upstream php-handler {
+    server 127.0.0.1:9000;
 }
-
 server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
-
+    listen 80;
+    listen [::]:80;
    server_name _;
+    return 301 https://$host$request_uri;
+}
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+    server_name _;
+    ssl_certificate /config/keys/cert.crt;
+    ssl_certificate_key /config/keys/cert.key;

-    root /config/www/nextcloud/;
+    # Add headers to serve security related headers
+    # Before enabling Strict-Transport-Security headers please read into this
+    # topic first.
+    #add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
+    #
+    # WARNING: Only add the preload option once you read about
+    # the consequences in https://hstspreload.org/. This option
+    # will add the domain to a hardcoded list that is shipped
+    # in all major browsers and getting removed from this list
+    # could take several months.

-    # display real ip in nginx logs when connected through reverse proxy via docker network
-    set_real_ip_from 172.0.0.0/8;
-    real_ip_header X-Forwarded-For;
-
-    # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html#nextcloud-in-the-webroot-of-nginx
-
-    # set max upload size and increase upload timeout:
+    # set max upload size
    client_max_body_size 512M;
    client_body_timeout 300s;
    fastcgi_buffers 64 4K;
@@ -36,27 +38,24 @@ server {
    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/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;

-    # Pagespeed is not supported by Nextcloud, so if your server is built
-    # with the `ngx_pagespeed` module, uncomment this line to disable it.
-    #pagespeed off;
-
-    # The settings allows you to optimize the HTTP2 bandwitdth.
-    # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
-    # for tunning hints
-    client_body_buffer_size 512k;
-
    # HTTP response headers borrowed from Nextcloud `.htaccess`
-    add_header Referrer-Policy                      "no-referrer"       always;
-    add_header X-Content-Type-Options               "nosniff"           always;
-    add_header X-Download-Options                   "noopen"            always;
-    add_header X-Frame-Options                      "SAMEORIGIN"        always;
-    add_header X-Permitted-Cross-Domain-Policies    "none"              always;
-    add_header X-Robots-Tag                         "noindex, nofollow" always;
-    add_header X-XSS-Protection                     "1; mode=block"     always;
+    add_header Referrer-Policy                      "no-referrer"   always;
+    add_header X-Content-Type-Options               "nosniff"       always;
+    add_header X-Download-Options                   "noopen"        always;
+    add_header X-Frame-Options                      "SAMEORIGIN"    always;
+    add_header X-Permitted-Cross-Domain-Policies    "none"          always;
+    add_header X-Robots-Tag                         "none"          always;
+    add_header X-XSS-Protection                     "1; mode=block" always;

    # Remove X-Powered-By, which is an information leak
    fastcgi_hide_header X-Powered-By;

+    root /config/www/nextcloud/;
+
+    # display real ip in nginx logs when connected through reverse proxy via docker network
+    set_real_ip_from 172.0.0.0/8;
+    real_ip_header X-Forwarded-For;
+
    # Specify how to handle directories -- specifying `/index.php$request_uri`
    # here as the fallback means that Nginx always exhibits the desired behaviour
    # when a client requests a path that corresponds to a directory that exists
@@ -121,10 +120,11 @@ server {
        include /etc/nginx/fastcgi_params;
        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
        fastcgi_param PATH_INFO $path_info;
+        fastcgi_param HTTPS on;

        fastcgi_param modHeadersAvailable true;         # Avoid sending the security headers twice
        fastcgi_param front_controller_active true;     # Enable pretty urls
-        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_pass php-handler;

        fastcgi_intercept_errors on;
        fastcgi_request_buffering off;
@@ -134,7 +134,7 @@ server {

    location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
        try_files $uri /index.php$request_uri;
-        add_header Cache-Control "public, max-age=15778463, $asset_immutable";
+        expires 6M;         # Cache-Control policy borrowed from `.htaccess`
        access_log off;     # Optional: Don't log access to assets

        location ~ \.wasm$ {
@@ -154,15 +154,7 @@ server {
    }

    location / {
-        # enable for basic auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
        try_files $uri $uri/ /index.php$request_uri;
    }

-    # deny access to .htaccess/.htpasswd files
-    location ~ /\.ht {
-        deny all;
-    }
 }
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+ocpath="${NEXTCLOUD_PATH}"
+htuser='abc'
+htgroup='abc'
+rootuser='root'
+
+printf "Creating possible missing Directories\n"
+mkdir -p $ocpath/data
+mkdir -p $ocpath/assets
+mkdir -p $ocpath/updater
+
+printf "chmod Files and Directories\n"
+find ${ocpath}/ -type f -print0 | xargs -0 chmod 0640
+find ${ocpath}/ -type d -print0 | xargs -0 chmod 0750
+
+printf "chown Directories\n"
+chown -R ${rootuser}:${htgroup} ${ocpath}/
+chown -R ${htuser}:${htgroup} ${ocpath}/apps/
+chown -R ${htuser}:${htgroup} ${ocpath}/assets/
+chown -R ${htuser}:${htgroup} ${ocpath}/config/
+chown -R ${htuser}:${htgroup} ${ocpath}/data/
+chown -R ${htuser}:${htgroup} ${ocpath}/themes/
+chown -R ${htuser}:${htgroup} ${ocpath}/updater/
+
+chmod +x ${ocpath}/occ
+
+printf "chmod/chown .htaccess\n"
+if [ -f ${ocpath}/.htaccess ]; then
+    chmod 0644 ${ocpath}/.htaccess
+    chown ${rootuser}:${htgroup} ${ocpath}/.htaccess
+fi
+if [ -f ${ocpath}/data/.htaccess ]; then
+    chmod 0644 ${ocpath}/data/.htaccess
+    chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess
+fi
@@ -6,4 +6,4 @@
 0       3       *       *       6       run-parts /etc/periodic/weekly
 0       5       1       *       *       run-parts /etc/periodic/monthly
 # nextcloud cron
-*/5     *       *       *       *       s6-setuidgid abc php -f /config/www/nextcloud/cron.php
+*/5     *       *       *       *       s6-setuidgid abc php8 -f /config/www/nextcloud/cron.php
@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+
+# permissions
+chown abc:abc \
+    /config \
+    /data
+chown -R abc:abc  \
+    /var/lib/nginx
@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bash
+
+# create folders
+mkdir -p \
+    "${NEXTCLOUD_PATH}" \
+    /config/crontabs
+
+# install app
+if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
+    tar xf /app/nextcloud.tar.bz2 -C \
+        "${NEXTCLOUD_PATH}" --strip-components=1
+    chown abc:abc -R \
+        "${NEXTCLOUD_PATH}"
+    chmod +x "${NEXTCLOUD_PATH}/occ"
+fi
+
+# set cronjob
+[[ ! -f /config/crontabs/root ]] && \
+    cp /defaults/root /config/crontabs/root
+sed -i 's|php7|php8|g' /config/crontabs/root
+cp /config/crontabs/root /etc/crontabs/root
@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bash
+
+# copy config
+[[ ! -f /config/www/nextcloud/config/config.php ]] && \
+    cp /defaults/config.php /config/www/nextcloud/config/config.php
+
+# permissions
+chown abc:abc \
+    /config/www/nextcloud/config/config.php
@@ -0,0 +1,20 @@
+#!/usr/bin/with-contenv bash
+
+## Set alias for occ and make executable
+[[ ! -f /usr/bin/occ ]] && \
+    echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/occ $*"' > /usr/bin/occ
+
+[[ ! -x /usr/bin/occ ]] && \
+    chmod +x /usr/bin/occ
+
+## Set alias for updater.phar and make executable
+[[ ! -f /usr/bin/updater.phar ]] && \
+    echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar
+
+[[ ! -x /usr/bin/updater.phar ]] && \
+    chmod +x /usr/bin/updater.phar
+
+if ( occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
+    echo "Removing CODE Server" 
+    occ app:remove --no-interaction richdocumentscode 2>/dev/null 
+fi
@@ -1,23 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# make folders
-mkdir -p \
-    /config/crontabs
-
-## root
-# if crontabs do not exist in config
-if [[ ! -f /config/crontabs/root ]]; then
-    # copy crontab from system
-    if crontab -l -u root; then
-        crontab -l -u root >/config/crontabs/root
-    fi
-
-    # if crontabs still do not exist in config (were not copied from system)
-    # copy crontab from included defaults (using -n, do not overwrite an existing file)
-    cp -n /etc/crontabs/root /config/crontabs/
-fi
-sed -i "s|s6-setuidgid abc php[78] -f /config/www/nextcloud/cron.php|s6-setuidgid abc php -f /config/www/nextcloud/cron.php|" /config/crontabs/root
-# set permissions and import user crontabs
-lsiown root:root /config/crontabs/root
-crontab -u root /config/crontabs/root
@@ -1 +0,0 @@
-oneshot
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-crontabs-config/run
@@ -1,32 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# create folders
-mkdir -p \
-    /config/www/nextcloud \
-    /data
-
-# install app
-if [ ! -e /config/www/nextcloud/index.php ]; then
-    tar xf /app/nextcloud.tar.bz2 -C \
-        /config/www/nextcloud --strip-components=1
-    lsiown abc:abc -R \
-        /config/www/nextcloud
-    chmod +x /config/www/nextcloud/occ
-fi
-
-# copy config
-if [[ ! -f /config/www/nextcloud/config/config.php ]]; then
-    cp /defaults/config.php /config/www/nextcloud/config/config.php
-fi
-
-# permissions
-lsiown abc:abc \
-    /config/www/nextcloud/config/config.php \
-    /data
-
-if (occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
-    echo "Removing CODE Server"
-    APP=$(occ app:list --no-interaction | grep richdocumentscode | awk -F ' ' '{print $2}' | tr -d ':')
-    occ app:remove --no-interaction "${APP}" 2>/dev/null
-fi
@@ -1 +0,0 @@
-oneshot
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+exec /usr/sbin/crond -f -S -l 0 -c /etc/crontabs
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-sudo -u abc -s /bin/bash -c "php /config/www/nextcloud/occ $*"
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-sudo -u abc -s /bin/bash -c "php /config/www/nextcloud/updater/updater.phar $*"
Author	SHA1	Message	Date
LinuxServer-CI	f78acfcaf3	Bot Updating Package Versions	2022-09-04 17:34:32 +02:00
LinuxServer-CI	b5e20d02a4	Bot Updating Package Versions	2022-08-28 17:34:29 +02:00
LinuxServer-CI	879dd4dcf4	Bot Updating Package Versions	2022-08-21 17:33:48 +02:00
LinuxServer-CI	b6eabe53c8	Bot Updating Package Versions	2022-08-12 04:17:55 -05:00
LinuxServer-CI	d24a8c50cf	Bot Updating Package Versions	2022-08-07 10:33:15 -05:00
LinuxServer-CI	3f0024d06a	Bot Updating Package Versions	2022-07-31 10:33:30 -05:00
LinuxServer-CI	869337ffff	Bot Updating Package Versions	2022-07-24 10:34:56 -05:00
LinuxServer-CI	b6b6990ecc	Bot Updating Package Versions	2022-07-17 17:33:27 +02:00
LinuxServer-CI	ec427fe900	Bot Updating Package Versions	2022-07-10 17:33:23 +02:00
LinuxServer-CI	6cef3a1902	Bot Updating Package Versions	2022-07-03 10:32:51 -05:00
LinuxServer-CI	0218ee58eb	Bot Updating Package Versions	2022-06-26 17:32:56 +02:00
LinuxServer-CI	ce464f063a	Bot Updating Package Versions	2022-06-19 17:32:27 +02:00
LinuxServer-CI	2e78d11ff3	Bot Updating Package Versions	2022-06-12 10:32:19 -05:00
aptalca	be7553e985	Merge pull request #252 from linuxserver/php8-updates bring php8 in line with latest tag	2022-06-05 13:31:59 -04:00
aptalca	301dffdcc4	bring in line with latest tag	2022-06-05 12:55:50 -04:00
LinuxServer-CI	873c29cf46	Bot Updating Package Versions	2022-06-05 10:32:06 -05:00
LinuxServer-CI	9792c3395b	Bot Updating Package Versions	2022-05-29 10:35:19 -05:00
LinuxServer-CI	225619ad6f	Bot Updating Package Versions	2022-05-22 10:35:48 -05:00
LinuxServer-CI	58d1a71d22	Bot Updating Package Versions	2022-05-15 10:35:00 -05:00
LinuxServer-CI	0d583a1726	Bot Updating Package Versions	2022-05-08 10:37:02 -05:00
LinuxServer-CI	50b93b57cd	Bot Updating Templated Files	2022-05-08 17:33:50 +02:00
LinuxServer-CI	747369512e	Bot Updating Package Versions	2022-05-01 10:42:35 -05:00
LinuxServer-CI	84baba1066	Bot Updating Templated Files	2022-05-01 10:35:22 -05:00
LinuxServer-CI	2558108134	Bot Updating Templated Files	2022-05-01 17:34:01 +02:00
LinuxServer-CI	225f31e0fc	Bot Updating Package Versions	2022-04-17 11:39:38 -05:00
LinuxServer-CI	f8350c5000	Bot Updating Package Versions	2022-04-10 17:33:29 +02:00
LinuxServer-CI	15ff0c6030	Bot Updating Package Versions	2022-04-03 10:33:06 -05:00
LinuxServer-CI	a003647ac1	Bot Updating Package Versions	2022-03-27 17:32:43 +02:00
LinuxServer-CI	094601733c	Bot Updating Package Versions	2022-03-17 18:19:47 +01:00
Adam	be1eef5cff	Merge pull request #239 from linuxserver/fix-git-php8	2022-03-17 17:15:56 +00:00
TheSpad	65e14df4a5	Change smbclient clone from git:// to https:// to allow unauthenticated use.	2022-03-17 09:29:12 +00:00
LinuxServer-CI	30274c83e1	Bot Updating Package Versions	2022-03-13 10:32:28 -05:00
LinuxServer-CI	9694a43305	Bot Updating Package Versions	2022-02-27 16:31:52 +01:00
LinuxServer-CI	57e8697500	Bot Updating Package Versions	2022-02-20 16:31:51 +01:00
LinuxServer-CI	5cc91f888a	Bot Updating Package Versions	2022-02-13 16:31:26 +01:00
LinuxServer-CI	6bbf4f1e2b	Bot Updating Package Versions	2022-02-06 16:30:27 +01:00
LinuxServer-CI	8d7d62acd0	Bot Updating Package Versions	2022-01-23 16:32:31 +01:00
LinuxServer-CI	30046bbc68	Bot Updating Package Versions	2021-12-26 16:33:53 +01:00
LinuxServer-CI	ea734680b9	Bot Updating Templated Files	2021-12-19 16:34:33 +01:00
LinuxServer-CI	f0cb338bfb	Bot Updating Templated Files	2021-12-19 16:33:09 +01:00
LinuxServer-CI	37fea1f7c1	Bot Updating Package Versions	2021-12-12 16:34:22 +01:00
LinuxServer-CI	e87b8deabf	Bot Updating Package Versions	2021-12-05 16:33:45 +01:00
LinuxServer-CI	c351c68522	Bot Updating Package Versions	2021-11-28 16:33:30 +01:00
LinuxServer-CI	7f8f48dd15	Bot Updating Package Versions	2021-11-21 16:33:09 +01:00
LinuxServer-CI	3f66db8ad1	Bot Updating Package Versions	2021-11-14 16:33:43 +01:00
LinuxServer-CI	0a507509b0	Bot Updating Package Versions	2021-11-12 15:16:53 +01:00
LinuxServer-CI	cc4f859229	Bot Updating Package Versions	2021-11-11 10:16:28 +01:00
LinuxServer-CI	cb2807c48b	Bot Updating Package Versions	2021-10-31 16:32:56 +01:00
LinuxServer-CI	121edddb8f	Bot Updating Package Versions	2021-10-24 17:32:46 +02:00
LinuxServer-CI	c8b614cf84	Bot Updating Package Versions	2021-10-17 17:32:35 +02:00
LinuxServer-CI	b167f0bd9c	Bot Updating Package Versions	2021-10-10 17:32:15 +02:00
LinuxServer-CI	2cfac01e18	Bot Updating Templated Files	2021-10-03 17:32:37 +02:00
LinuxServer-CI	8e8c5915a2	Bot Updating Templated Files	2021-10-03 17:31:28 +02:00
LinuxServer-CI	6a0bdee688	Bot Updating Package Versions	2021-09-30 11:17:55 +02:00
LinuxServer-CI	2cb7ba662f	Bot Updating Package Versions	2021-09-26 17:32:42 +02:00
LinuxServer-CI	e54e344910	Bot Updating Package Versions	2021-09-19 17:32:37 +02:00
LinuxServer-CI	4cf6371b65	Bot Updating Package Versions	2021-09-12 17:32:41 +02:00
LinuxServer-CI	c4a984f4c1	Bot Updating Package Versions	2021-09-05 17:32:40 +02:00
LinuxServer-CI	f48ca9d3ea	Bot Updating Package Versions	2021-08-29 17:35:55 +02:00
LinuxServer-CI	de197f3e1a	Bot Updating Templated Files	2021-08-29 17:32:03 +02:00
LinuxServer-CI	2c2df1e367	Bot Updating Package Versions	2021-08-22 17:36:38 +02:00
LinuxServer-CI	ff4a56db21	Bot Updating Package Versions	2021-08-15 17:38:45 +02:00
LinuxServer-CI	3cc1474386	Bot Updating Package Versions	2021-08-05 15:25:05 +02:00
LinuxServer-CI	9b57369d48	Bot Updating Package Versions	2021-08-01 17:39:46 +02:00
LinuxServer-CI	4b69b7c771	Bot Updating Package Versions	2021-07-25 17:40:02 +02:00
LinuxServer-CI	c3edf34346	Bot Updating Package Versions	2021-07-18 17:40:47 +02:00
LinuxServer-CI	9aa1ba3f2d	Bot Updating Package Versions	2021-07-11 15:38:59 +00:00
LinuxServer-CI	b5dcbd3a54	Bot Updating Package Versions	2021-07-06 07:14:16 -04:00
LinuxServer-CI	7a539fcefd	Bot Updating Templated Files	2021-07-04 11:36:55 -04:00
LinuxServer-CI	17033d41f5	Bot Updating Templated Files	2021-07-04 15:35:53 +00:00
LinuxServer-CI	05485754bf	Bot Updating Package Versions	2021-07-01 16:24:54 +00:00
LinuxServer-CI	cbae795d6c	Bot Updating Package Versions	2021-06-24 15:43:34 +00:00
aptalca	c51e83e759	Merge pull request #205 from linuxserver/php8-3.14 rebase to 3.14, update formatting	2021-06-24 11:37:08 -04:00
aptalca	f189000a2c	rebase to 3.14, update formatting	2021-06-24 09:25:36 -04:00
LinuxServer-CI	c1802b152a	Bot Updating Package Versions	2021-06-20 11:42:37 -04:00
LinuxServer-CI	ead8b9b923	Bot Updating Package Versions	2021-06-13 16:42:56 +01:00
LinuxServer-CI	cdad3b26ce	Bot Updating Package Versions	2021-06-06 12:03:00 -04:00
LinuxServer-CI	8808f21139	Bot Updating Package Versions	2021-05-30 16:01:30 +00:00
LinuxServer-CI	08adb958cd	Bot Updating Package Versions	2021-05-20 09:27:26 +00:00
LinuxServer-CI	04fde8415e	Bot Updating Package Versions	2021-05-16 11:48:39 -04:00
LinuxServer-CI	1ec5618901	Bot Updating Package Versions	2021-05-09 16:41:59 +01:00
LinuxServer-CI	145490764b	Bot Updating Package Versions	2021-04-25 15:44:14 +00:00
LinuxServer-CI	ab0057a375	Bot Updating Package Versions	2021-04-18 11:55:16 -04:00
LinuxServer-CI	0a717ae242	Bot Updating Templated Files	2021-04-18 16:38:07 +01:00
LinuxServer-CI	904ac218ae	Bot Updating Templated Files	2021-04-18 16:36:55 +01:00
LinuxServer-CI	d45aadc662	Bot Updating Package Versions	2021-04-09 08:54:47 +00:00
LinuxServer-CI	19d5048ba8	Bot Updating Package Versions	2021-04-03 11:08:39 +01:00
j0nnymoe	be23d13d86	Merge pull request #196 from linuxserver/php8-cron fix crontab during upgrade from php7	2021-04-03 10:59:42 +01:00
aptalca	0010c0c2a0	fix crontab during upgrade from php7	2021-04-01 12:30:43 -04:00
LinuxServer-CI	78c93b3dee	Bot Updating Package Versions	2021-03-28 15:54:48 +00:00
LinuxServer-CI	615cc14425	Bot Updating Package Versions	2021-03-21 16:33:12 -04:00
j0nnymoe	da485b2766	Merge pull request #192 from linuxserver/php8-dev rebase on php8 nginx baseimage	2021-03-21 20:15:45 +00:00
aptalca	7517ff9346	rebase on php8 nginx baseimage	2021-03-16 16:20:24 -04:00
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-crontabs-config/run`
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run`