Bot Updating Package Versions

Bot Updating Templated Files
2026-06-03 09:57:35 +00:00 · 2024-03-14 21:33:06 +00:00 · 2024-03-12 20:31:37 +00:00 · 2024-03-07 22:34:05 +00:00 · 2024-03-06 18:32:28 +00:00 · 2024-03-06 18:25:39 +00:00
32 changed files with 1364 additions and 930 deletions
@@ -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/develop/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/develop/root), add an entry to the changelog

 ```yml
 changelogs:
@@ -53,7 +53,6 @@ body:
      options:
        - x86-64
        - arm64
-        - armhf
    validations:
      required: true
  - type: textarea
@@ -68,10 +67,10 @@ body:
  - type: textarea
    attributes:
      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs nextcloud"
      label: Container logs
      placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs nextcloud`
      render: bash
    validations:
      required: true
@@ -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/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

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

@@ -2,9 +2,11 @@ name: Issue & PR Tracker

 on:
  issues:
-    types: [opened,reopened,labeled,unlabeled]
+    types: [opened,reopened,labeled,unlabeled,closed]
  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]

 jobs:
  manage-project:
@@ -4,24 +4,26 @@ on:
  workflow_dispatch:

 jobs:
-  external-trigger-master:
+  external-trigger-develop:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
        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_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\". ****"
+          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\". ****"
+          echo "External trigger running off of develop branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
          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||')
+          EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
          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 develop"
            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"}],
@@ -30,9 +32,10 @@ jobs:
          fi
          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/nextcloud"
-          tag="latest"
+          tag="develop"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fnextcloud%3Apull" \
            | jq -r '.token')
@@ -58,23 +61,27 @@ jobs:
          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 develop"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-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/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/buildWithParameters?PACKAGE_CHECK=false \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/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 ****"
@@ -82,6 +89,7 @@ jobs:
            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
            buildurl="${buildurl%$'\r'}"
            echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
            echo "**** Attempting to change the Jenkins job description ****"
            curl -iX POST \
              "${buildurl}submitDescription" \
@@ -89,7 +97,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 develop. 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 }}
@@ -2,14 +2,14 @@ name: External Trigger Scheduler

 on:
  schedule:
-    - cron:  '00 * * * *'
+    - cron:  '27 * * * *'
  workflow_dispatch:

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

@@ -17,18 +17,18 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            if [ "$br" == "$ls_branch" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml)
+            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
+            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
+            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
+              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
@@ -36,8 +36,10 @@ jobs:
                  https://api.github.com/repos/linuxserver/docker-nextcloud/actions/workflows/external_trigger.yml/dispatches
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
            fi
          done
@@ -9,5 +9,5 @@ jobs:
    - 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)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -4,25 +4,28 @@ on:
  workflow_dispatch:

 jobs:
-  package-trigger-master:
+  package-trigger-develop:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
        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_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            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/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\". ****"
+          echo "**** Package trigger running off of develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\". ****"
+          echo "Package trigger running off of develop branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
          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/develop/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 ****"
@@ -30,6 +33,7 @@ jobs:
          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
          buildurl="${buildurl%$'\r'}"
          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
          echo "**** Attempting to change the Jenkins job description ****"
          curl -iX POST \
            "${buildurl}submitDescription" \
@@ -9,7 +9,7 @@ jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

@@ -17,18 +17,16 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/jenkins-vars.yml | yq -r '.ls_branch')
            if [ "${br}" == "${ls_branch}" ]; then
              echo "**** Branch ${br} appears to be live; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-nextcloud/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                triggered_branches="${triggered_branches}${br} "
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
@@ -38,9 +36,11 @@ jobs:
                sleep 30
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
            fi
          done
          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19

 # set version label
 ARG BUILD_DATE
@@ -14,78 +14,85 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
    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 \
+    php83-apcu \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pcntl \
+    php83-pdo_mysql \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pecl-imagick \
+    php83-pecl-memcached \
+    php83-pecl-smbclient \
+    php83-pgsql \
+    php83-posix \
+    php83-redis \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-sysvsem \
+    php83-xmlreader \
+    rsync \
    samba-client \
    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/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.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' \
-    -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
-    -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
-    -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
-    -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 && \
-  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 && \
-  echo "**** set version tag ****" && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
+    php83-pecl-mcrypt && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  echo "**** configure php for nextcloud ****" && \
+  { \
+    echo 'apc.enable_cli=1'; \
+  } >> /etc/php83/conf.d/apcu.ini && \
+  { \
+    echo 'opcache.enable=1'; \
+    echo 'opcache.interned_strings_buffer=32'; \
+    echo 'opcache.max_accelerated_files=10000'; \
+    echo 'opcache.memory_consumption=128'; \
+    echo 'opcache.save_comments=1'; \
+    echo 'opcache.revalidate_freq=60'; \
+    echo 'opcache.jit=1255'; \
+    echo 'opcache.jit_buffer_size=128M'; \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
+  { \
+    echo 'memory_limit=512M'; \
+    echo 'upload_max_filesize=512M'; \
+    echo 'post_max_size=512M'; \
+    echo 'max_input_time=300'; \
+    echo 'max_execution_time=300'; \
+    echo 'output_buffering=0'; \
+    echo 'always_populate_raw_post_data=-1'; \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
+  echo "**** install nextcloud ****" && \
+  mkdir -p \
+    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' \
-      | sed 's|^v||'); \
+    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
+      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
-  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 && \
+  curl -o \
+    /tmp/nextcloud.tar.bz2 -L \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+  tar xf /tmp/nextcloud.tar.bz2 -C \
+    /app/www/src --strip-components=1 && \
+  rm -rf /app/www/src/updater && \
+  mkdir -p /app/www/src/data && \
+  chmod +x /app/www/src/occ && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19

 # set version label
 ARG BUILD_DATE
@@ -14,78 +14,85 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
    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 \
+    php83-apcu \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pcntl \
+    php83-pdo_mysql \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pecl-imagick \
+    php83-pecl-memcached \
+    php83-pecl-smbclient \
+    php83-pgsql \
+    php83-posix \
+    php83-redis \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-sysvsem \
+    php83-xmlreader \
+    rsync \
    samba-client \
    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/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.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' \
-    -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
-    -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
-    -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
-    -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 && \
-  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 && \
-  echo "**** set version tag ****" && \
+  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
+    php83-pecl-mcrypt && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
+  echo "**** configure php for nextcloud ****" && \
+  { \
+    echo 'apc.enable_cli=1'; \
+  } >> /etc/php83/conf.d/apcu.ini && \
+  { \
+    echo 'opcache.enable=1'; \
+    echo 'opcache.interned_strings_buffer=32'; \
+    echo 'opcache.max_accelerated_files=10000'; \
+    echo 'opcache.memory_consumption=128'; \
+    echo 'opcache.save_comments=1'; \
+    echo 'opcache.revalidate_freq=60'; \
+    echo 'opcache.jit=1255'; \
+    echo 'opcache.jit_buffer_size=128M'; \
+  } >> "/etc/php83/conf.d/00_opcache.ini" && \
+  { \
+    echo 'memory_limit=512M'; \
+    echo 'upload_max_filesize=512M'; \
+    echo 'post_max_size=512M'; \
+    echo 'max_input_time=300'; \
+    echo 'max_execution_time=300'; \
+    echo 'output_buffering=0'; \
+    echo 'always_populate_raw_post_data=-1'; \
+  } >> "/etc/php83/conf.d/nextcloud.ini" && \
+  echo "**** install nextcloud ****" && \
+  mkdir -p \
+    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' \
-      | sed 's|^v||'); \
+    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
+      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
-  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 && \
+  curl -o \
+    /tmp/nextcloud.tar.bz2 -L \
+    https://download.nextcloud.com/server/prereleases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+  tar xf /tmp/nextcloud.tar.bz2 -C \
+    /app/www/src --strip-components=1 && \
+  rm -rf /app/www/src/updater && \
+  mkdir -p /app/www/src/data && \
+  chmod +x /app/www/src/occ && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
@@ -1,98 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG NEXTCLOUD_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
-
-# environment settings
-ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
-
-RUN \
-  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
-    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 \
-    samba-client \
-    sudo && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php81-pecl-mcrypt \
-    php81-pecl-smbclient && \
-  echo "**** configure php and nginx for nextcloud ****" && \
-  echo 'apc.enable_cli=1' >> /etc/php81/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.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' \
-    -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \
-    -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \
-    -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \
-    -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 && \
-  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 && \
-  echo "**** set version tag ****" && \
-  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
-    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest \
-      | awk '/tag_name/{print $4;exit}' FS='[""]' \
-      | sed 's|^v||'); \
-  fi && \
-  echo "**** download nextcloud ****" && \
-  curl -o /app/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
-  echo "**** test tarball ****" && \
-    tar xvf /app/nextcloud.tar.bz2 -C \
-      /tmp && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /tmp/*
-
-# copy local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 80 443
-VOLUME /config
@@ -16,7 +16,7 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
    BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-nextcloud'
@@ -39,10 +39,16 @@ pipeline {
    // Setup all the basic environment variables needed for the build
    stage("Set ENV Variables base"){
      steps{
+        sh '''#! /bin/bash
+              containers=$(docker ps -aq)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:develop 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' ''',
@@ -53,11 +59,16 @@ pipeline {
          env.COMMIT_SHA = sh(
            script: '''git rev-parse HEAD''',
            returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
        }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
          env.LS_RELEASE_NUMBER = sh(
            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -66,7 +77,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 develop-${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -104,7 +115,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET https://api.github.com/repos/nextcloud/server/releases/latest | jq -r '. | .tag_name' | sed 's|^v||' ''',
+            script: ''' curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1 ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
@@ -115,7 +126,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
            returnStdout: true).trim()

          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -133,7 +144,7 @@ pipeline {
          }

          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
            }
            println("SEMVER: ${env.SEMVER}")
@@ -144,10 +155,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a develop build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -157,20 +168,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-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-develop-' + 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 = 'develop-' + 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 = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'develop-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 "develop"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -180,13 +191,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-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-develop-' + 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 = 'develop-' + 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 = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -203,13 +214,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-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'develop-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/'
        }
@@ -228,15 +239,17 @@ pipeline {
          script{
            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
          }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
                docker run --rm \
                  -v ${WORKSPACE}:/mnt \
                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
-                    pip install s3cmd && \
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                    apk add --no-cache python3 && \
+                    python3 -m venv /lsiopy && \
+                    pip install --no-cache-dir -U pip && \
+                    pip install --no-cache-dir s3cmd && \
                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
        }
      }
@@ -244,7 +257,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -255,26 +268,34 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-              # Stage 1 - Jenkinsfile update
+              # Cloned repo paths for templating:
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch develop of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch develop of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch develop --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Updating Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "Jenkinsfile is up to date."
              fi
-              # Stage 2 - Delete old templates
-              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"
+              echo "Starting Stage 2 - Delete old templates"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -284,20 +305,21 @@ 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 develop
                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
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "No templates to delete"
              fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 3 - Update templates"
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -305,40 +327,60 @@ 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 develop
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                cd ${TEMPDIR}/repo/${LS_REPO}/
                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                  echo ".jenkins-external" >> .gitignore
                  git add .gitignore
                fi
-                git add ${TEMPLATED_FILES}
+                git add readme-vars.yml ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
              else
                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "No templates to update"
              fi
-              mkdir -p ${TEMPDIR}/gitbook
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
-                cd ${TEMPDIR}/gitbook/docker-documentation/
-                git add images/docker-${CONTAINER_NAME}.md
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
+              mkdir -p ${TEMPDIR}/docs
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
              fi
              mkdir -p ${TEMPDIR}/unraid
              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                  echo "Image is on the ignore list, marking Unraid template as deprecated"
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
@@ -350,7 +392,42 @@ pipeline {
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
              fi
              rm -Rf ${TEMPDIR}'''
        script{
@@ -363,7 +440,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -376,6 +453,26 @@ pipeline {
        }
      }
    }
+    // If this is a develop build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "develop"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
    /* #######################
           GitLab Mirroring
       ####################### */
@@ -386,44 +483,16 @@ pipeline {
      }
      steps{
        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
-      } 
-    }
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "master"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/nextcloud") | .uuid')
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/nextcloud",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-nextcloud",\
-                       "backendUrl":"https://ghcr.io/linuxserver/nextcloud",\
-                       "publicUrl":"https://lscr.io/linuxserver/nextcloud"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+            "name":"'${LS_REPO}'",
+            "mirror":true,\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "issues_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
+            "repository_access_level":"enabled",\
+            "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
      } 
    }
    /* ###############
@@ -488,41 +557,6 @@ pipeline {
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          steps {
-            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nextcloud/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-nextcloud\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-nextcloud\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=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 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-          }
-        }
        stage('Build ARM64') {
          agent {
            label 'ARM64'
@@ -553,9 +587,12 @@ pipeline {
            retry(5) {
              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            sh '''#! /bin/bash
+                  containers=$(docker ps -aq)
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
          }
        }
      }
@@ -563,7 +600,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -586,13 +623,14 @@ pipeline {
              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 develop
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -610,19 +648,12 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -631,7 +662,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 "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -640,13 +671,6 @@ pipeline {
        }
      }
      steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -668,14 +692,13 @@ pipeline {
        ]) {
          script{
            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
          }
          sh '''#! /bin/bash
                set -e
                docker pull ghcr.io/linuxserver/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
@@ -694,8 +717,6 @@ pipeline {
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
-                -e DO_BUCKET="lsio-ci" \
                -t ghcr.io/linuxserver/ci:latest \
                python3 test_build.py'''
        }
@@ -712,12 +733,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -728,18 +743,18 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  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}:develop
                    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}:develop
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
@@ -748,17 +763,6 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
        }
      }
    }
@@ -770,12 +774,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -786,64 +784,60 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
                  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-develop
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-develop
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-develop
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
+                    docker push ${MANIFESTIMAGE}:arm64v8-develop
                    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}:develop || :
+                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
+                    docker manifest annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm64v8-develop --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                    if [ -n "${SEMVER}" ]; then
                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
+                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
+                    digest=$(curl -s \
+                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+                      --header "Authorization: Bearer ${token}" \
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-develop")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-develop ${MANIFESTIMAGE}:amd64-develop
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop
+                    fi
+                    docker manifest push --purge ${MANIFESTIMAGE}:develop
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
                    if [ -n "${SEMVER}" ]; then
@@ -852,36 +846,13 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
-                done
-                docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
        }
      }
    }
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "develop"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -893,64 +864,132 @@ 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 develop",\
             "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": "develop",\
                     "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'''
      }
    }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
+    // Add protection to the release branch
+    stage('Github-Release-Branch-Protection') {
      when {
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
+        echo "Setting up protection for release branch develop"
+        sh '''#! /bin/bash
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/develop/protection \
+          -d $(jq -c .  << EOF
+            {
+              "required_status_checks": null,
+              "enforce_admins": false,
+              "required_pull_request_reviews": {
+                "dismiss_stale_reviews": false,
+                "require_code_owner_reviews": false,
+                "require_last_push_approval": false,
+                "required_approving_review_count": 1
+              },
+              "restrictions": null,
+              "required_linear_history": false,
+              "allow_force_pushes": false,
+              "allow_deletions": false,
+              "block_creations": false,
+              "required_conversation_resolution": true,
+              "lock_branch": false,
+              "allow_fork_syncing": false,
+              "required_signatures": false
+            }
+EOF
+          ) '''
      }
    }
    // If this is a Pull request send the CI link as a comment on it
    stage('Pull Request Comment') {
      when {
        not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
      }
    }
  }
@@ -976,6 +1015,14 @@ pipeline {
      }
    }
    cleanup {
+      sh '''#! /bin/bash
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
      cleanWs()
    }
  }
@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- Please read https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -37,7 +36,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%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/)
 [![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.
@@ -48,9 +47,9 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch

 ## Supported Architectures

-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

-Simply pulling `lscr.io/linuxserver/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:develop` 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,27 +57,28 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |
+
+## Version Tags
+
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
+
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable Nextcloud releases |
+| develop | ✅ | Beta Nextcloud pre-releases *only* |

 ## Application Setup

 Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud](https://nextcloud.com/).

-Docker image update and recreation of container alone won't update nextcloud version. 
+### Updating Nextcloud

-In order to update nextcloud version, you have two options, firstly make sure you are using the latest docker image,then either 
+Updating Nextcloud is done by pulling the new image, and recreating the container with it.

-1.  Perform the in app gui update. 
-2.  Use the CLI version by running `docker exec -it nextcloud updater.phar`
- (Both of these are described [here](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/update.html))
+It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.

-Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u abc php` or `sudo -u www-data php`
-
-If you are not customizing our default nginx configuration you will need to remove the file:
-```
-/config/nginx/site-confs/default.conf
-```
-Then restart the container to replace it with the latest one. 
+Since all data is stored in the `/config` and `/data` volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process.

 ### Collaborative Editing

@@ -86,6 +86,17 @@ 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.

+### Custom App Directories
+
+If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
+
+```yaml
+    volumes:
+      - /path/to/your_custom_apps_folder:/app/www/public/your_custom_apps_folder
+```
+
+Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).
+
 ### Strict reverse proxies

 This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
@@ -93,23 +104,22 @@ If you are using a reverse proxy which validates certificates, you need to [disa

 ## Usage

-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.

 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))

 ```yaml
 ---
-version: "2.1"
 services:
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: lscr.io/linuxserver/nextcloud:develop
    container_name: nextcloud
    environment:
      - PUID=1000
      - PGID=1000
      - TZ=Etc/UTC
    volumes:
-      - /path/to/appdata:/config
+      - /path/to/nextcloud/config:/config
      - /path/to/data:/data
    ports:
      - 443:443
@@ -125,16 +135,15 @@ docker run -d \
  -e PGID=1000 \
  -e TZ=Etc/UTC \
  -p 443:443 \
-  -v /path/to/appdata:/config \
+  -v /path/to/nextcloud/config:/config \
  -v /path/to/data:/data \
  --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud:latest
-
+  lscr.io/linuxserver/nextcloud:develop
 ```

 ## Parameters

-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.

 | Parameter | Function |
 | :----: | --- |
@@ -142,7 +151,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Nextcloud configs. |
+| `-v /config` | Persistent config files |
 | `-v /data` | Your personal data. |

 ## Environment variables from files (Docker secrets)
@@ -152,10 +161,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:

 ```bash
-e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```

-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.

 ## Umask for running applications

@@ -164,15 +173,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu

 ## User / Group Identifiers

-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.

 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.

-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:

 ```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```

 ## Docker Mods
@@ -183,53 +197,100 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to

 ## Support Info

-* Shell access whilst the container is running: `docker exec -it nextcloud /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f nextcloud`
-* 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`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it nextcloud /bin/bash
+    ```
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f nextcloud
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:develop
+    ```

 ## Updating Info

-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.

 Below are the instructions for updating containers:

 ### Via Docker Compose

-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull nextcloud`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d nextcloud`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull nextcloud
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d nextcloud
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/nextcloud:latest`
-* Stop the running container: `docker stop nextcloud`
-* Delete the container: `docker rm nextcloud`
+* Update the image:
+
+    ```bash
+    docker pull lscr.io/linuxserver/nextcloud:develop
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop nextcloud
+    ```
+
+* Delete the container:
+
+    ```bash
+    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)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:

-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once nextcloud
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+    ```bash
+    docker image prune
+    ```

 ### Image Update Notifications - Diun (Docker Image Update Notifier)

-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.

 ## Building locally

@@ -241,7 +302,7 @@ cd docker-nextcloud
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/nextcloud:latest .
+  -t lscr.io/linuxserver/nextcloud:develop .
 ```

 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -254,6 +315,16 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **06.03.24:** - Rebase to Alpine 3.19 with php 8.3.
+* **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
+* **22.12.23:** - Site default conf updating to include mime.types for js and mjs and update location to include more file types.
+* **28.10.23:** - Disable web upgrades using occ during init.
+* **31.08.23:** - Re-add updatenotification app. This allows users to be notified for app updates, but also notifies for NextCloud updates. Updating NextCloud via the web UI is not supported when using this image.
+* **14.08.23:** - Add develop branch.
+* **25.06.23:** - Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-25-nextcloud/).
+* **21.06.23:** - Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings.
+* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
+* **13.04.23:** - Move ssl.conf include to default.conf.
 * **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.
@@ -3,10 +3,11 @@
 # jenkins variables
 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
+custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
+build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
  - LS_USER = 'linuxserver'
@@ -1,235 +1,487 @@
-NAME                    VERSION                TYPE   
-alpine-baselayout       3.4.0-r0               apk     
-alpine-baselayout-data  3.4.0-r0               apk     
-alpine-keys             2.4-r1                 apk     
-alpine-release          3.17.3-r0              apk     
-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.62-r0            apk     
-imagemagick-libs        7.1.0.62-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.1.0-r0               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.5-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                  2023c-r0               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.5-r0               apk     
+NAME                                 VERSION                          TYPE                         
+@nextcloud/text                      3.10.0                           npm                           
+Process Wrapper                      1.0.0.0                          dotnet        (+1 duplicate)  
+activity                             2.21.0                           npm                           
+alpine-baselayout                    3.4.3-r2                         apk                           
+alpine-baselayout-data               3.4.3-r2                         apk                           
+alpine-keys                          2.4-r1                           apk                           
+alpine-release                       3.19.1-r0                        apk                           
+alsa-lib                             1.2.10-r0                        apk                           
+amphp/amp                            v2.6.2                           php-composer                  
+amphp/byte-stream                    v1.8.1                           php-composer                  
+amphp/parallel                       v1.4.3                           php-composer                  
+amphp/parser                         v1.1.0                           php-composer                  
+amphp/process                        v1.1.4                           php-composer                  
+amphp/serialization                  v1.0.0                           php-composer                  
+amphp/sync                           v1.4.2                           php-composer                  
+anyhow                               1.0.71                           rust-crate                    
+anyhow                               1.0.75                           rust-crate                    
+aom-libs                             3.7.1-r0                         apk                           
+apache2-utils                        2.4.58-r1                        apk                           
+apk-tools                            2.14.0-r5                        apk                           
+apr                                  1.7.4-r0                         apk                           
+apr-util                             1.6.3-r1                         apk                           
+arg_enum_proc_macro                  0.3.2                            rust-crate                    
+argon2-libs                          20190702-r5                      apk                           
+arrayvec                             0.7.2                            rust-crate                    
+av-metrics                           0.9.0                            rust-crate                    
+av1-grain                            0.2.2                            rust-crate                    
+aws/aws-crt-php                      v1.0.2                           php-composer                  
+aws/aws-sdk-php                      3.240.8                          php-composer                  
+bamarni/composer-bin-plugin          1.8.2                            php-composer                  
+bantu/ini-get-wrapper                v1.0.1                           php-composer                  
+bash                                 5.2.21-r0                        apk                           
+beberlei/assert                      v3.3.1                           php-composer                  
+bitflags                             1.3.2                            rust-crate                    
+bitstream-io                         1.6.0                            rust-crate                    
+bitstream-io                         1.7.0                            rust-crate                    
+bitvec                               1.0.1                            rust-crate                    
+bitvec_helpers                       3.1.2                            rust-crate                    
+brick/math                           0.9.2                            php-composer                  
+brotli-libs                          1.1.0-r1                         apk                           
+bruteforcesettings                   2.9.0                            npm                           
+busybox                              1.36.1-r15                       apk                           
+busybox-binsh                        1.36.1-r15                       apk                           
+c-ares                               1.24.0-r1                        apk                           
+c-client                             2007f-r15                        apk                           
+ca-certificates                      20230506-r0                      apk                           
+ca-certificates-bundle               20230506-r0                      apk                           
+cfg-if                               1.0.0                            rust-crate                    
+christian-riesen/base32              1.6.0                            php-composer                  
+cjson                                1.7.17-r0                        apk                           
+clap                                 4.0.32                           rust-crate                    
+clap_complete                        4.0.7                            rust-crate                    
+clap_derive                          4.0.21                           rust-crate                    
+clap_lex                             0.3.0                            rust-crate                    
+composer                             2.7.2                            binary                        
+console                              0.15.5                           rust-crate                    
+coreutils                            9.4-r2                           apk                           
+coreutils-env                        9.4-r2                           apk                           
+coreutils-fmt                        9.4-r2                           apk                           
+coreutils-sha512sum                  9.4-r2                           apk                           
+crc                                  3.0.1                            rust-crate                    
+crc-catalog                          2.2.0                            rust-crate                    
+crossbeam                            0.8.2                            rust-crate                    
+crossbeam-channel                    0.5.8                            rust-crate                    
+crossbeam-deque                      0.8.3                            rust-crate                    
+crossbeam-epoch                      0.9.14                           rust-crate                    
+crossbeam-queue                      0.3.8                            rust-crate                    
+crossbeam-utils                      0.8.15                           rust-crate                    
+curl                                 8.5.0-r0                         apk                           
+cweagans/composer-patches            1.7.3                            php-composer                  
+dbus-libs                            1.14.10-r0                       apk                           
+deepdiver/zipstreamer                v2.0.2                           php-composer                  
+deepdiver1975/tarstreamer            v2.1.0                           php-composer                  
+doctrine/cache                       2.2.0                            php-composer                  
+doctrine/dbal                        3.7.0                            php-composer                  
+doctrine/deprecations                1.1.2                            php-composer                  
+doctrine/event-manager               1.2.0                            php-composer                  
+doctrine/lexer                       2.1.0                            php-composer                  
+dolby_vision                         3.2.0                            rust-crate                    
+egulias/email-validator              3.2.6                            php-composer                  
+either                               1.8.1                            rust-crate                    
+fern                                 0.6.2                            rust-crate                    
+ffmpeg                               6.1.1-r0                         apk                           
+ffmpeg-libavcodec                    6.1.1-r0                         apk                           
+ffmpeg-libavdevice                   6.1.1-r0                         apk                           
+ffmpeg-libavfilter                   6.1.1-r0                         apk                           
+ffmpeg-libavformat                   6.1.1-r0                         apk                           
+ffmpeg-libavutil                     6.1.1-r0                         apk                           
+ffmpeg-libpostproc                   6.1.1-r0                         apk                           
+ffmpeg-libswresample                 6.1.1-r0                         apk                           
+ffmpeg-libswscale                    6.1.1-r0                         apk                           
+fftw-double-libs                     3.3.10-r5                        apk                           
+fgrosse/phpasn1                      v2.3.0                           php-composer                  
+files_downloadlimit                  1.1.0                            npm                           
+files_pdfviewer                      2.10.0                           npm                           
+firstrunwizard                       2.18.0                           npm                           
+fontconfig                           2.14.2-r4                        apk                           
+freetype                             2.13.2-r0                        apk                           
+fribidi                              1.0.13-r0                        apk                           
+funty                                2.0.0                            rust-crate                    
+fusonic/linq                         v1.1.0                           php-composer                  
+fusonic/opengraph                    v2.2.0                           php-composer                  
+gdbm                                 1.23-r1                          apk                           
+getrandom                            0.2.9                            rust-crate                    
+giggsey/libphonenumber-for-php-lite  8.13.27                          php-composer                  
+git                                  2.43.0-r0                        apk                           
+glib                                 2.78.4-r0                        apk                           
+glslang-libs                         1.3.261.1-r0                     apk                           
+gmp                                  6.3.0-r0                         apk                           
+gnu-libiconv                         1.17-r2                          apk                           
+gnu-libiconv-libs                    1.17-r2                          apk                           
+gnutls                               3.8.3-r0                         apk                           
+graphite2                            1.3.14-r6                        apk                           
+guzzlehttp/guzzle                    7.8.1                            php-composer                  
+guzzlehttp/promises                  1.5.3                            php-composer                  
+guzzlehttp/psr7                      2.6.2                            php-composer                  
+guzzlehttp/uri-template              v0.2.0                           php-composer                  
+harfbuzz                             8.3.0-r0                         apk                           
+heck                                 0.4.1                            rust-crate                    
+hexogen/kdtree                       v0.2.5                           php-composer                  
+hiredis                              1.2.0-r0                         apk                           
+hwdata-pci                           0.377.2-r0                       apk                           
+icewind/searchdav                    v3.1.0                           php-composer                  
+icewind/smb                          v3.5.4                           php-composer                  
+icewind/streams                      v0.7.7                           php-composer  (+1 duplicate)  
+icu-data-en                          74.1-r0                          apk                           
+icu-libs                             74.1-r0                          apk                           
+imagemagick                          7.1.1.26-r0                      apk                           
+imagemagick-jpeg                     7.1.1.26-r0                      apk                           
+imagemagick-jxl                      7.1.1.26-r0                      apk                           
+imagemagick-libs                     7.1.1.26-r0                      apk                           
+imagemagick-webp                     7.1.1.26-r0                      apk                           
+interpolate_name                     0.2.3                            rust-crate                    
+io-lifetimes                         1.0.10                           rust-crate                    
+is-terminal                          0.4.7                            rust-crate                    
+itertools                            0.10.5                           rust-crate                    
+ivf                                  0.1.2                            rust-crate                    
+jansson                              2.14-r4                          apk                           
+jq                                   1.7.1-r0                         apk                           
+justinrainbow/json-schema            v5.2.13                          php-composer                  
+kornrunner/blurhash                  v1.2.2                           php-composer                  
+lab                                  0.11.0                           rust-crate                    
+lame-libs                            3.100-r5                         apk                           
+laravel/serializable-closure         v1.3.3                           php-composer                  
+lazy_static                          1.4.0                            rust-crate                    
+lcms2                                2.15-r4                          apk                           
+ldb                                  2.7.2-r1                         apk                           
+league/flysystem                     2.5.0                            php-composer                  
+league/mime-type-detection           1.11.0                           php-composer                  
+league/uri                           6.4.0                            php-composer                  
+league/uri-interfaces                2.2.0                            php-composer                  
+libSvtAv1Enc                         1.7.0-r0                         apk                           
+libacl                               2.3.1-r4                         apk                           
+libarchive                           3.7.2-r0                         apk                           
+libass                               0.17.1-r1                        apk                           
+libasyncns                           0.8-r2                           apk                           
+libattr                              2.5.1-r5                         apk                           
+libavif                              1.0.3-r0                         apk                           
+libblkid                             2.39.3-r0                        apk                           
+libbluray                            1.3.4-r1                         apk                           
+libbsd                               0.11.7-r3                        apk                           
+libbz2                               1.0.8-r6                         apk                           
+libc                                 0.2.144                          rust-crate                    
+libc                                 0.2.149                          rust-crate                    
+libc-utils                           0.7.2-r5                         apk                           
+libcap2                              2.69-r1                          apk                           
+libcrypto3                           3.1.4-r5                         apk                           
+libcurl                              8.5.0-r0                         apk                           
+libdav1d                             1.3.0-r1                         apk                           
+libdovi                              3.2.0-r1                         apk                           
+libdrm                               2.4.118-r0                       apk                           
+libedit                              20230828.3.1-r3                  apk                           
+libevent                             2.1.12-r7                        apk                           
+libexpat                             2.6.0-r0                         apk                           
+libffi                               3.4.4-r3                         apk                           
+libflac                              1.4.3-r1                         apk                           
+libformw                             6.4_p20231125-r0                 apk                           
+libgcc                               13.2.1_git20231014-r0            apk                           
+libgomp                              13.2.1_git20231014-r0            apk                           
+libhwy                               1.0.7-r0                         apk                           
+libice                               1.1.1-r5                         apk                           
+libidn2                              2.3.4-r4                         apk                           
+libintl                              0.22.3-r0                        apk                           
+libjpeg-turbo                        3.0.1-r0                         apk                           
+libjxl                               0.8.2-r0                         apk                           
+libldap                              2.6.6-r1                         apk                           
+libltdl                              2.4.7-r3                         apk                           
+libmcrypt                            2.5.8-r10                        apk                           
+libmd                                1.1.0-r0                         apk                           
+libmemcached-libs                    1.1.4-r1                         apk                           
+libmount                             2.39.3-r0                        apk                           
+libncursesw                          6.4_p20231125-r0                 apk                           
+libogg                               1.3.5-r5                         apk                           
+libopenmpt                           0.7.3-r1                         apk                           
+libpanelw                            6.4_p20231125-r0                 apk                           
+libpciaccess                         0.17-r2                          apk                           
+libplacebo                           6.338.1-r0                       apk                           
+libpng                               1.6.40-r0                        apk                           
+libpq                                16.2-r0                          apk                           
+libproc2                             4.0.4-r0                         apk                           
+libpulse                             16.1-r11                         apk                           
+librist                              0.2.10-r0                        apk                           
+libsasl                              2.1.28-r5                        apk                           
+libsharpyuv                          1.3.2-r0                         apk                           
+libsm                                1.2.4-r3                         apk                           
+libsmbclient                         4.18.9-r0                        apk                           
+libsndfile                           1.2.2-r0                         apk                           
+libsodium                            1.0.19-r0                        apk                           
+libsrt                               1.5.3-r0                         apk                           
+libssh                               0.10.6-r0                        apk                           
+libssl3                              3.1.4-r5                         apk                           
+libstdc++                            13.2.1_git20231014-r0            apk                           
+libtasn1                             4.19.0-r2                        apk                           
+libtheora                            1.1.1-r18                        apk                           
+libunibreak                          5.1-r3                           apk                           
+libunistring                         1.1-r2                           apk                           
+libuuid                              2.39.3-r0                        apk                           
+libva                                2.20.0-r0                        apk                           
+libvdpau                             1.5-r2                           apk                           
+libvorbis                            1.3.7-r2                         apk                           
+libvpx                               1.13.1-r0                        apk                           
+libwbclient                          4.18.9-r0                        apk                           
+libwebp                              1.3.2-r0                         apk                           
+libwebpdemux                         1.3.2-r0                         apk                           
+libwebpmux                           1.3.2-r0                         apk                           
+libx11                               1.8.7-r0                         apk                           
+libxau                               1.0.11-r3                        apk                           
+libxcb                               1.16-r0                          apk                           
+libxdmcp                             1.1.4-r3                         apk                           
+libxext                              1.3.5-r3                         apk                           
+libxfixes                            6.0.1-r3                         apk                           
+libxml2                              2.11.7-r0                        apk                           
+libxpm                               3.5.17-r0                        apk                           
+libxt                                1.3.0-r4                         apk                           
+libxxhash                            0.8.2-r2                         apk                           
+libzip                               1.10.1-r0                        apk                           
+libzmq                               4.3.5-r2                         apk                           
+lilv-libs                            0.24.22-r0                       apk                           
+linux-pam                            1.5.3-r7                         apk                           
+linux-raw-sys                        0.3.7                            rust-crate                    
+lmdb                                 0.9.31-r0                        apk                           
+log                                  0.4.17                           rust-crate                    
+logreader                            2.14.0                           npm                           
+logrotate                            3.21.0-r1                        apk                           
+lz4-libs                             1.9.4-r5                         apk                           
+maybe-rayon                          0.1.1                            rust-crate                    
+mbedtls                              2.28.7-r0                        apk                           
+memchr                               2.5.0                            rust-crate                    
+memoffset                            0.8.0                            rust-crate                    
+mexitek/phpcolors                    v1.0.4                           php-composer                  
+microsoft/azure-storage-blob         1.5.4                            php-composer                  
+microsoft/azure-storage-common       1.5.2                            php-composer                  
+minimal-lexical                      0.2.1                            rust-crate                    
+mlocati/ip-lib                       1.18.0                           php-composer                  
+mpg123-libs                          1.32.3-r0                        apk                           
+mtdowling/jmespath.php               2.6.1                            php-composer                  
+musl                                 1.2.4_git20230717-r4             apk                           
+musl-utils                           1.2.4_git20230717-r4             apk                           
+nano                                 7.2-r1                           apk                           
+ncurses-terminfo-base                6.4_p20231125-r0                 apk                           
+netcat-openbsd                       1.226-r0                         apk                           
+nettle                               3.9.1-r0                         apk                           
+new_debug_unreachable                1.0.4                            rust-crate                    
+nextcloud                            1.0.0                            npm                           
+nextcloud/lognormalizer              v1.0.0                           php-composer                  
+nghttp2-libs                         1.58.0-r0                        apk                           
+nginx                                1.24.0-r15                       apk                           
+nom                                  7.1.3                            rust-crate                    
+noop_proc_macro                      0.3.0                            rust-crate                    
+notifications                        2.17.0                           npm                           
+num-bigint                           0.4.3                            rust-crate                    
+num-derive                           0.3.3                            rust-crate                    
+num-integer                          0.1.45                           rust-crate                    
+num-rational                         0.4.1                            rust-crate                    
+num-traits                           0.2.15                           rust-crate                    
+num_cpus                             1.15.0                           rust-crate                    
+numactl                              2.0.16-r4                        apk                           
+once_cell                            1.17.1                           rust-crate                    
+onevpl-libs                          2023.3.1-r2                      apk                           
+oniguruma                            6.9.9-r0                         apk                           
+openssl                              3.1.4-r5                         apk                           
+opus                                 1.4-r0                           apk                           
+orc                                  0.4.34-r0                        apk                           
+os_str_bytes                         6.5.0                            rust-crate                    
+p11-kit                              0.25.3-r0                        apk                           
+password_policy                      1.19.0                           npm                           
+paste                                1.0.12                           rust-crate                    
+pcre                                 8.45-r3                          apk                           
+pcre2                                10.42-r2                         apk                           
+pear/archive_tar                     1.4.14                           php-composer                  
+pear/console_getopt                  v1.4.3                           php-composer                  
+pear/pear-core-minimal               v1.10.14                         php-composer                  
+pear/pear_exception                  v1.0.2                           php-composer                  
+photos                               2.5.0                            npm                           
+php-http/guzzle7-adapter             1.0.0                            php-composer                  
+php-http/httplug                     2.2.0                            php-composer                  
+php-http/promise                     1.1.0                            php-composer                  
+php-opencloud/openstack              v3.2.1                           php-composer                  
+php83                                8.3.3-r0                         apk                           
+php83-bcmath                         8.3.3-r0                         apk                           
+php83-bz2                            8.3.3-r0                         apk                           
+php83-common                         8.3.3-r0                         apk                           
+php83-ctype                          8.3.3-r0                         apk                           
+php83-curl                           8.3.3-r0                         apk                           
+php83-dom                            8.3.3-r0                         apk                           
+php83-exif                           8.3.3-r0                         apk                           
+php83-fileinfo                       8.3.3-r0                         apk                           
+php83-fpm                            8.3.3-r0                         apk                           
+php83-ftp                            8.3.3-r0                         apk                           
+php83-gd                             8.3.3-r0                         apk                           
+php83-gmp                            8.3.3-r0                         apk                           
+php83-iconv                          8.3.3-r0                         apk                           
+php83-imap                           8.3.3-r0                         apk                           
+php83-intl                           8.3.3-r0                         apk                           
+php83-ldap                           8.3.3-r0                         apk                           
+php83-mbstring                       8.3.3-r0                         apk                           
+php83-mysqlnd                        8.3.3-r0                         apk                           
+php83-opcache                        8.3.3-r0                         apk                           
+php83-openssl                        8.3.3-r0                         apk                           
+php83-pcntl                          8.3.3-r0                         apk                           
+php83-pdo                            8.3.3-r0                         apk                           
+php83-pdo_mysql                      8.3.3-r0                         apk                           
+php83-pdo_pgsql                      8.3.3-r0                         apk                           
+php83-pdo_sqlite                     8.3.3-r0                         apk                           
+php83-pecl-apcu                      5.1.23-r0                        apk                           
+php83-pecl-igbinary                  3.2.15-r0                        apk                           
+php83-pecl-imagick                   3.7.0-r0                         apk                           
+php83-pecl-mcrypt                    1.0.7-r0                         apk                           
+php83-pecl-memcached                 3.2.0-r0                         apk                           
+php83-pecl-msgpack                   2.2.0-r1                         apk                           
+php83-pecl-redis                     6.0.2-r0                         apk                           
+php83-pecl-smbclient                 1.1.1-r0                         apk                           
+php83-pgsql                          8.3.3-r0                         apk                           
+php83-phar                           8.3.3-r0                         apk                           
+php83-posix                          8.3.3-r0                         apk                           
+php83-session                        8.3.3-r0                         apk                           
+php83-simplexml                      8.3.3-r0                         apk                           
+php83-sockets                        8.3.3-r0                         apk                           
+php83-sodium                         8.3.3-r0                         apk                           
+php83-sqlite3                        8.3.3-r0                         apk                           
+php83-sysvsem                        8.3.3-r0                         apk                           
+php83-xml                            8.3.3-r0                         apk                           
+php83-xmlreader                      8.3.3-r0                         apk                           
+php83-xmlwriter                      8.3.3-r0                         apk                           
+php83-zip                            8.3.3-r0                         apk                           
+phpseclib/phpseclib                  2.0.45                           php-composer                  
+pimple/pimple                        v3.5.0                           php-composer                  
+popt                                 1.19-r3                          apk                           
+ppv-lite86                           0.2.17                           rust-crate                    
+privacy                              1.13.0                           npm                           
+proc-macro-error                     1.0.4                            rust-crate                    
+proc-macro-error-attr                1.0.4                            rust-crate                    
+proc-macro2                          1.0.57                           rust-crate                    
+procps-ng                            4.0.4-r0                         apk                           
+psr/cache                            3.0.0                            php-composer                  
+psr/clock                            1.0.0                            php-composer                  
+psr/container                        2.0.2                            php-composer                  
+psr/event-dispatcher                 1.0.0                            php-composer                  
+psr/http-client                      1.0.3                            php-composer                  
+psr/http-factory                     1.0.2                            php-composer                  
+psr/http-message                     1.1                              php-composer                  
+psr/log                              1.1.4                            php-composer  (+1 duplicate)  
+punic/punic                          3.8.1                            php-composer                  
+quote                                1.0.27                           rust-crate                    
+radium                               0.7.0                            rust-crate                    
+ralouphie/getallheaders              3.0.3                            php-composer                  
+ramsey/collection                    1.1.3                            php-composer                  
+ramsey/uuid                          4.1.1                            php-composer                  
+rand                                 0.8.5                            rust-crate                    
+rand_chacha                          0.3.1                            rust-crate                    
+rand_core                            0.6.4                            rust-crate                    
+rav1e                                0.6.6                            rust-crate                    
+rav1e-libs                           0.6.6-r2                         apk                           
+rayon                                1.7.0                            rust-crate                    
+rayon-core                           1.11.0                           rust-crate                    
+readline                             8.2.1-r2                         apk                           
+recommendations                      2.1.0                            npm                           
+related_resources                    1.4.0                            npm                           
+rsync                                3.2.7-r4                         apk                           
+rubix/ml                             dev-chore/bump-flysystem-v2.1.1  php-composer                  
+rubix/tensor                         2.2.3                            php-composer                  
+rullzer/easytotp                     v0.1.4                           php-composer                  
+rust_hawktracer                      0.7.0                            rust-crate                    
+rust_hawktracer_normal_macro         0.4.1                            rust-crate                    
+rust_hawktracer_proc_macro           0.4.1                            rust-crate                    
+rustix                               0.37.19                          rust-crate                    
+sabre/dav                            4.5.0                            php-composer                  
+sabre/event                          5.1.4                            php-composer                  
+sabre/http                           5.1.10                           php-composer                  
+sabre/uri                            2.3.3                            php-composer                  
+sabre/vobject                        4.5.4                            php-composer                  
+sabre/xml                            2.2.6                            php-composer                  
+samba-client                         4.18.9-r0                        apk                           
+samba-client-libs                    4.18.9-r0                        apk                           
+samba-common                         4.18.9-r0                        apk                           
+samba-libs                           4.18.9-r0                        apk                           
+samba-util-libs                      4.18.9-r0                        apk                           
+scan_fmt                             0.2.6                            rust-crate                    
+scanelf                              1.3.7-r2                         apk                           
+scopeguard                           1.1.0                            rust-crate                    
+scssphp/scssphp                      v1.12.1                          php-composer                  
+sdl2                                 2.28.5-r0                        apk                           
+serd-libs                            0.32.0-r0                        apk                           
+serde                                1.0.163                          rust-crate                    
+serde_derive                         1.0.163                          rust-crate                    
+shaderc                              2023.7-r0                        apk                           
+shadow                               4.14.2-r0                        apk                           
+signal-hook                          0.3.15                           rust-crate                    
+signal-hook-registry                 1.4.1                            rust-crate                    
+simd_helpers                         0.1.0                            rust-crate                    
+skalibs                              2.14.0.1-r0                      apk                           
+sord-libs                            0.16.16-r0                       apk                           
+soxr                                 0.1.3-r7                         apk                           
+speexdsp                             1.2.1-r2                         apk                           
+spirv-tools                          1.3.261.1-r0                     apk                           
+spomky-labs/base64url                v2.0.4                           php-composer                  
+spomky-labs/cbor-php                 v2.0.1                           php-composer                  
+sqlite-libs                          3.44.2-r0                        apk                           
+sratom                               0.6.16-r0                        apk                           
+ssl_client                           1.36.1-r15                       apk                           
+stecman/symfony-console-completion   0.11.0                           php-composer                  
+sudo                                 1.9.15_p2-r0                     apk                           
+support                              1.12.0                           npm                           
+suspicious_login                     7.0.0                            npm                           
+symfony/console                      v5.4.35                          php-composer                  
+symfony/css-selector                 v5.4.11                          php-composer                  
+symfony/deprecation-contracts        v3.0.2                           php-composer                  
+symfony/dom-crawler                  v5.4.11                          php-composer                  
+symfony/event-dispatcher             v5.4.26                          php-composer                  
+symfony/event-dispatcher-contracts   v3.0.2                           php-composer                  
+symfony/http-foundation              v5.4.25                          php-composer                  
+symfony/mailer                       v5.4.22                          php-composer                  
+symfony/mime                         v5.4.19                          php-composer                  
+symfony/polyfill-ctype               v1.28.0                          php-composer                  
+symfony/polyfill-intl-grapheme       v1.28.0                          php-composer                  
+symfony/polyfill-intl-idn            v1.28.0                          php-composer                  
+symfony/polyfill-intl-normalizer     v1.28.0                          php-composer                  
+symfony/polyfill-mbstring            v1.27.0                          php-composer                  
+symfony/polyfill-mbstring            v1.28.0                          php-composer                  
+symfony/polyfill-php72               v1.28.0                          php-composer                  
+symfony/polyfill-php73               v1.26.0                          php-composer                  
+symfony/polyfill-php73               v1.28.0                          php-composer                  
+symfony/polyfill-php80               v1.27.0                          php-composer                  
+symfony/polyfill-php80               v1.28.0                          php-composer                  
+symfony/process                      v5.4.34                          php-composer                  
+symfony/routing                      v5.4.25                          php-composer                  
+symfony/service-contracts            v3.0.2                           php-composer                  
+symfony/string                       v6.0.19                          php-composer                  
+symfony/translation                  v5.4.24                          php-composer                  
+symfony/translation-contracts        v2.4.0                           php-composer                  
+syn                                  1.0.109                          rust-crate                    
+syn                                  2.0.16                           rust-crate                    
+talloc                               2.4.2-r0                         apk                           
+tap                                  1.0.1                            rust-crate                    
+tdb-libs                             1.4.9-r0                         apk                           
+termcolor                            1.2.0                            rust-crate                    
+terminal_size                        0.2.6                            rust-crate                    
+tevent                               0.15.0-r0                        apk                           
+thecodingmachine/safe                v1.3.3                           php-composer                  
+thiserror                            1.0.40                           rust-crate                    
+thiserror-impl                       1.0.40                           rust-crate                    
+twofactor_totp                       11.0.0-dev                       npm                           
+tzdata                               2024a-r0                         apk                           
+unicode-ident                        1.0.8                            rust-crate                    
+unicode-width                        0.1.10                           rust-crate                    
+utmps-libs                           0.1.2.2-r0                       apk                           
+v4l-utils-libs                       1.24.1-r1                        apk                           
+v_frame                              0.3.3                            rust-crate                    
+vidstab                              1.1.1-r0                         apk                           
+viewer                               2.3.0                            npm                           
+vulkan-loader                        1.3.261.1-r0                     apk                           
+wapmorgan/mp3info                    0.1.0                            php-composer                  
+wayland-libs-client                  1.22.0-r4                        apk                           
+web-auth/cose-lib                    v3.3.9                           php-composer                  
+web-auth/metadata-service            v3.3.9                           php-composer                  
+web-auth/webauthn-lib                v3.3.9                           php-composer                  
+wyz                                  0.5.1                            rust-crate                    
+x264-libs                            0.164_git20231001-r0             apk                           
+x265-libs                            3.5-r4                           apk                           
+xvidcore                             1.3.7-r2                         apk                           
+xz-libs                              5.4.5-r0                         apk                           
+y4m                                  0.8.0                            rust-crate                    
+zimg                                 3.0.5-r2                         apk                           
+zix-libs                             0.4.2-r0                         apk                           
+zlib                                 1.3.1-r0                         apk                           
+zstd-libs                            1.5.5-r8                         apk                           
@@ -15,12 +15,12 @@ project_blurb_optional_extras_enabled: false
 available_architectures:
  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}

 # development version
-development_versions: false
+development_versions: true
 development_versions_items:
  - { tag: "latest", desc: "Stable Nextcloud releases" }
+  - { tag: "develop", desc: "Beta Nextcloud pre-releases *only*" }

 # container parameters
 common_param_env_vars_enabled: true
@@ -31,7 +31,7 @@ param_env_vars:
  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata", desc: "Nextcloud configs." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
  - { vol_path: "/data", vol_host_path: "/path/to/data", desc: "Your personal data." }
 param_usage_include_ports: true
 param_ports:
@@ -52,31 +52,43 @@ app_setup_block_enabled: true
 app_setup_block: |
  Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).

-  Docker image update and recreation of container alone won't update nextcloud version. 
+  ### Updating Nextcloud

-  In order to update nextcloud version, you have two options, firstly make sure you are using the latest docker image,then either 
-  
-  1.  Perform the in app gui update. 
-  2.  Use the CLI version by running `docker exec -it nextcloud updater.phar`
-   (Both of these are described [here](https://docs.nextcloud.com/server/latest/admin_manual/maintenance/update.html))
+  Updating Nextcloud is done by pulling the new image, and recreating the container with it.

-  Note:  Both `occ` and `updater.phar` can be run without prepending with `sudo -u abc php` or `sudo -u www-data php`
-  
-  If you are not customizing our default nginx configuration you will need to remove the file:
-  ```
-  /config/nginx/site-confs/default.conf
-  ```
-  Then restart the container to replace it with the latest one. 
+  It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.
+
+  Since all data is stored in the `/config` and `/data` volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process.

  ### Collaborative Editing

  Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffice) only work on x86_64 systems with glibc, and therefore they are not compatible with our images. You should create separate containers for them and set them up in Nextcloud with their respective connector addons.

  If (auto) installed, those built-in packages may cause instability and should be removed.
-  
+
+  ### Custom App Directories
+
+  If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
+
+  ```yaml
+      volumes:
+        - /path/to/your_custom_apps_folder:/app/www/public/your_custom_apps_folder
+  ```
+
+  Afterwards, you can set `"path" => OC::$SERVERROOT . "/your_custom_apps_folder",` in your `config.php` file, per the [official documentation](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories).

 # changelog
 changelogs:
+  - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - { date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
+  - { date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types." }
+  - { date: "28.10.23:", desc: "Disable web upgrades using occ during init." }
+  - { date: "31.08.23:", desc: "Re-add updatenotification app. This allows users to be notified for app updates, but also notifies for NextCloud updates. Updating NextCloud via the web UI is not supported when using this image." }
+  - { date: "14.08.23:", desc: "Add develop branch." }
+  - { date: "25.06.23:", desc: "Move Nextcloud installation inside container. Remove CLI updater. [See changes announcement](https://info.linuxserver.io/issues/2023-06-25-nextcloud/)." }
+  - { date: "21.06.23:", desc: "Existing users should update `/config/nginx/site-confs/default.conf` - Security fix for real ip settings." }
+  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
+  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
  - { date: "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." }
@@ -0,0 +1,4 @@
+/apps/
+/config/
+/data/
+/themes/
@@ -1,6 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.local' => '\OC\Memcache\APCu',
-  'datadirectory' => '/data',
-  );
-
@@ -1,4 +1,4 @@
-## Version 2023/03/21 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/01/03 - 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 {
@@ -15,10 +15,12 @@ server {

    server_name _;

-    root /config/www/nextcloud/;
+    include /config/nginx/ssl.conf;
+
+    root /app/www/public;

    # display real ip in nginx logs when connected through reverse proxy via docker network
-    set_real_ip_from 172.0.0.0/8;
+    set_real_ip_from 172.16.0.0/12;
    real_ip_header X-Forwarded-For;

    # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html#nextcloud-in-the-webroot-of-nginx
@@ -34,25 +36,24 @@ server {
    gzip_comp_level 4;
    gzip_min_length 256;
    gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
-    gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/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;
+    gzip_types application/atom+xml text/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.
+    # The settings allows you to optimize the HTTP2 bandwidth.
    # See https://blog.cloudflare.com/delivering-http-2-upload-speed-improvements/
-    # for tunning hints
+    # for tuning 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-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;

    # Remove X-Powered-By, which is an information leak
    fastcgi_hide_header X-Powered-By;
@@ -64,7 +65,7 @@ server {
    # that file is correctly served; if it doesn't, then the request is passed to
    # the front-end controller. This consistent behaviour means that we don't need
    # to specify custom rules for certain paths (e.g. images and other assets,
-    # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
+    # `/updater`, `/ocs-provider`), and thus
    # `try_files $uri $uri/ /index.php$request_uri`
    # always provides the desired behaviour.
    index index.php index.html /index.php$request_uri;
@@ -111,7 +112,7 @@ server {
    # to the URI, resulting in a HTTP 500 error response.
    location ~ \.php(?:$|/) {
        # Required for legacy support
-        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
+        rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;

        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
        set $path_info $fastcgi_path_info;
@@ -132,7 +133,8 @@ server {
        fastcgi_max_temp_file_size 0;
    }

-    location ~ \.(?:css|js|svg|gif|png|jpg|ico|wasm|tflite|map)$ {
+    # Serve static files
+    location ~ \.(?:css|js|mjs|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
        try_files $uri /index.php$request_uri;
        add_header Cache-Control "public, max-age=15778463, $asset_immutable";
        access_log off;     # Optional: Don't log access to assets
@@ -140,6 +142,7 @@ server {
        location ~ \.wasm$ {
            default_type application/wasm;
        }
+
    }

    location ~ \.woff2?$ {
@@ -0,0 +1,2 @@
+# min   hour    day     month   weekday command
+*/5     *       *       *       *       /usr/bin/php /app/www/public/cron.php 2>&1
@@ -1,9 +0,0 @@
-# do daily/weekly/monthly maintenance
-# min   hour    day     month   weekday command
-*/15    *       *       *       *       run-parts /etc/periodic/15min
-0       *       *       *       *       run-parts /etc/periodic/hourly
-0       2       *       *       *       run-parts /etc/periodic/daily
-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
@@ -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
@@ -3,30 +3,174 @@

 # create folders
 mkdir -p \
-    /config/www/nextcloud \
+    /app/www/public \
+    /config/www/nextcloud/apps \
+    /config/www/nextcloud/config \
+    /config/www/nextcloud/themes \
    /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
+# migrate legacy install (copy inside container)
+if [ -f /config/www/nextcloud/version.php ]; then
+    echo "Migrating legacy install (this can take a while) ...)"
+    rsync -rlD --remove-source-files --exclude-from=/app/upgrade.exclude /config/www/nextcloud/ /app/www/public/
+    rm -rf /config/www/nextcloud/updater/
+    find \
+        /config/www/nextcloud/ \
+        -type d -empty \
+        ! -path "/config/www/nextcloud/apps" \
+        ! -path "/config/www/nextcloud/config" \
+        ! -path "/config/www/nextcloud/themes" \
+        -delete
+    touch /config/www/nextcloud/config/needs_migration
 fi

-# copy config
-if [[ ! -f /config/www/nextcloud/config/config.php ]]; then
-    cp /defaults/config.php /config/www/nextcloud/config/config.php
+# symlink config folders
+for dir in apps config themes; do
+    if [ "$(readlink /app/www/public/${dir})" != "/config/www/nextcloud/${dir}" ]; then
+        rm -rf "/app/www/public/${dir}"
+        ln -s "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
+        lsiown abc:abc "/config/www/nextcloud/${dir}" "/app/www/public/${dir}"
+    fi
+done
+
+# get versions
+image_version=$(php -r "require '/app/www/src/version.php'; echo implode('.', \$OC_Version);" 2>/dev/null)
+installed_version=$(php -r "require '/config/www/nextcloud/config/config.php'; echo \$CONFIG['version'];" 2>/dev/null)
+if [ "${installed_version}" = "" ]; then
+    installed_version="0.0.0.0"
 fi
+image_major="${image_version%%.*}"
+installed_major="${installed_version%%.*}"
+((max_upgrade = installed_major + 1))
+
+# compare versions
+vergte() { printf '%s\n%s' "${2}" "${1}" | sort -C -V; }
+vergt() { ! vergte "${2}" "${1}"; }
+verlte() { printf '%s\n%s' "${1}" "${2}" | sort -C -V; }
+verlt() { ! verlte "${2}" "${1}"; }
+
+if vergt "${installed_version}" "${image_version}"; then
+    echo "Can't start Nextcloud because the version of the data (${installed_version}) is higher than the docker image version (${image_version}) and downgrading is not supported. Are you sure you have pulled the newest image version?"
+    sleep infinity
+fi
+
+if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_major}" "${max_upgrade}"; then
+    echo "Can't start Nextcloud because the version of the data (${installed_version}) is more than one major version behind the docker image version (${image_version}) and upgrading more than one major version is not supported. Please run an image tagged for the major version ${max_upgrade} first."
+    sleep infinity
+fi
+
+if [ "${installed_version}" = "0.0.0.0" ] || [ ! -f /app/www/public/version.php ] || [ -z "$(ls -A /config/www/nextcloud/apps 2>/dev/null)" ]; then
+    touch /tmp/needs_install
+fi
+
+if [ "${installed_version}" != "0.0.0.0" ] && vergt "${image_version}" "${installed_version}"; then
+    touch /tmp/needs_upgrade
+fi
+
+# initialize nextcloud
+if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_install ] || [ -f /tmp/needs_upgrade ]; then
+    echo "Initializing nextcloud ${image_version} (this can take a while) ..."
+    if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
+        echo "Upgrading nextcloud from ${installed_version} ..."
+        shippedApps=$(jq -r .shippedApps[] /app/www/src/core/shipped.json)
+        for app in ${shippedApps}; do
+            rm -rf "/config/www/nextcloud/apps/${app}"
+        done
+    fi
+
+    rsync -rlD --exclude-from=/app/upgrade.exclude /app/www/src/ /app/www/public/
+    for dir in apps config themes; do
+        if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ] || [ -z "$(ls -A /app/www/public/${dir} 2>/dev/null)" ]; then
+            rsync -rlD --include "/${dir}" --exclude '/*' /app/www/src/ /config/www/nextcloud/
+        fi
+    done
+    if [ -z "$(ls -A /data/ 2>/dev/null)" ]; then
+        rsync -rlD --include "/data" --exclude '/*' /app/www/src/ /
+    fi
+
+    echo "Setting permissions"
+    lsiown abc:abc /data
+    lsiown -R abc:abc \
+        /app/www/public \
+        /config/www/nextcloud
+
+    if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_upgrade ]; then
+        # Upgrade
+        occ upgrade
+    else
+        if [ "${installed_version}" = "0.0.0.0" ]; then
+            # Install
+            echo "New nextcloud instance"
+            echo "Please run the web-based installer on first connect!"
+        fi
+    fi
+
+    echo "Initializing finished"
+fi
+
+rm -f \
+    /config/www/nextcloud/config/needs_migration \
+    /tmp/needs_install \
+    /tmp/needs_upgrade

 # permissions
 lsiown abc:abc \
-    /config/www/nextcloud/config/config.php \
-    /data
+    /app/www/public \
+    /config/www/nextcloud

-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
+# setup config
+if occ config:system:get installed >/dev/null 2>&1; then
+    if ! occ config:system:get memcache.local >/dev/null 2>&1; then
+        occ config:system:set memcache.local --value='\\OC\\Memcache\\APCu'
+    fi
+    if ! occ config:system:get filelocking.enabled >/dev/null 2>&1; then
+        occ config:system:set filelocking.enabled --value=true --type=boolean
+    fi
+    if ! occ config:system:get memcache.locking >/dev/null 2>&1; then
+        occ config:system:set memcache.locking --value='\\OC\\Memcache\\APCu'
+    fi
+    if ! occ config:system:get datadirectory >/dev/null 2>&1; then
+        occ config:system:set datadirectory --value='/data'
+    fi
+    if ! occ config:system:get upgrade.disable-web >/dev/null 2>&1; then
+        occ config:system:set upgrade.disable-web --value=true --type=boolean
+    fi
+else
+    echo "After completing the web-based installer, restart the Nextcloud container to apply default memory caching and transactional file locking configurations."
+    echo "Alternatively, you can apply your own configurations by editing /config/www/nextcloud/config/config.php following the documentation:"
+    echo "https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html"
+    echo "https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/files_locking_transactional.html"
+fi
+
+# remove problematic apps
+for APP in richdocumentscode; do
+    if (occ app:list | grep -q " - ${APP}:") 2>/dev/null; then
+        echo "Removing ${APP}"
+    fi
+    APP_PATH=$(occ app:getpath "${APP}" 2>/dev/null)
+    if [ -z "${APP_PATH}" ] || [ ! -d "${APP_PATH}" ]; then
+        APP_PATH="/app/www/public/apps/${APP}"
+    fi
+    if [ -d "${APP_PATH}" ]; then
+        occ app:disable "${APP}" >/dev/null 2>&1
+    fi
+    APP_STATUS="$(occ config:app:get "${APP}" enabled 2>/dev/null)"
+    if [ "${APP_STATUS}" != "no" ] && [ -n "${APP_STATUS}" ]; then
+        occ config:app:set "${APP}" enabled --value="no" >/dev/null 2>&1
+    fi
+    occ app:remove "${APP}" >/dev/null 2>&1
+    rm -rf "${APP_PATH}"
+done
+
+# set data directory
+if [ ! -s /config/www/nextcloud/config/config.php ]; then
+    echo -e "<?php\n\$CONFIG = array (\n    'datadirectory' => '/data',\n);" >/config/www/nextcloud/config/config.php
+elif [ -f /config/www/nextcloud/config/config.php ]; then
+    sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php
+fi
+
+#modify javascript mime type and add .mjs support
+if [ -s /etc/nginx/mime.types ]; then
+    sed -i 's|\bjs;|js mjs;|g' /etc/nginx/mime.types
+    sed -i 's|\bapplication/javascript|text/javascript|g' /etc/nginx/mime.types
 fi
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+DEFAULT_CONF="/config/nginx/site-confs/default.conf"
+OLD_ROOT="root /config/www/nextcloud/;"
+NEW_ROOT="root /app/www/public;"
+
+if [[ -f "${DEFAULT_CONF}" ]] && grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
+    echo "updating root in ${DEFAULT_CONF}"
+    sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
+fi
@@ -1,4 +1,4 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash

-sudo -u abc -s /bin/bash -c "php /config/www/nextcloud/occ $*"
+sudo -u abc -s /bin/bash -c "php /app/www/public/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	dead6f366e	Bot Updating Package Versions	2024-03-14 21:33:06 +00:00
LinuxServer-CI	c2c4010ffb	Bot Updating Templated Files	2024-03-12 20:31:37 +00:00
LinuxServer-CI	150c587dff	Bot Updating Package Versions	2024-03-07 22:34:05 +00:00
LinuxServer-CI	671cf6fe6c	Bot Updating Package Versions	2024-03-06 18:32:28 +00:00
LinuxServer-CI	a7da03b8d8	Bot Updating Templated Files	2024-03-06 18:25:39 +00:00
Eric Nemchik	7c8251110c	Rebase to Alpine 3.19 (#399 ) * Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com> * update date and edge repo --------- Signed-off-by: Eric Nemchik <eric@nemchik.com> Co-authored-by: aptalca <541623+aptalca@users.noreply.github.com>	2024-03-06 13:24:01 -05:00
LinuxServer-CI	11824dbfe3	Bot Updating Package Versions	2024-03-05 11:50:19 +00:00
LinuxServer-CI	0004b51af8	Bot Updating Package Versions	2024-02-27 11:57:52 +00:00
LinuxServer-CI	9706c0481a	Bot Updating Templated Files	2024-02-27 11:50:16 +00:00
LinuxServer-CI	bcf04398d0	Bot Updating Templated Files	2024-02-27 11:48:43 +00:00
LinuxServer-CI	48667a56dd	Bot Updating Package Versions	2024-02-16 14:34:20 +00:00
LinuxServer-CI	b906641f24	Bot Updating Package Versions	2024-02-13 11:52:12 +00:00
LinuxServer-CI	9e83ba52fc	Bot Updating Package Versions	2024-02-06 11:49:42 +00:00
LinuxServer-CI	0dfd84df5c	Bot Updating Package Versions	2024-01-29 15:37:30 +00:00
LinuxServer-CI	231f432f80	Bot Updating Package Versions	2024-01-23 10:40:44 +00:00
LinuxServer-CI	c15658c110	Bot Updating Package Versions	2024-01-18 17:36:47 +00:00
LinuxServer-CI	388fc6d47a	Bot Updating Package Versions	2024-01-16 11:56:53 +00:00
LinuxServer-CI	2fe50c2f12	Bot Updating Templated Files	2024-01-16 11:50:34 +00:00
LinuxServer-CI	21dde133fd	Bot Updating Templated Files	2024-01-16 11:48:58 +00:00
LinuxServer-CI	7bed73efff	Bot Updating Package Versions	2024-01-09 11:50:08 +00:00
driz	aede8706ae	Merge pull request #406 from linuxserver/dev-mime-fix Merge pull request #405 from linuxserver/conf-fix-test	2024-01-03 20:55:16 -05:00
Eric Nemchik	ccb0036a96	Merge pull request #405 from linuxserver/conf-fix-test maybe fix nextcloud?	2024-01-03 23:48:00 +00:00
LinuxServer-CI	6675775f5c	Bot Updating Templated Files	2024-01-02 16:12:23 +00:00
Eric Nemchik	9d7ea19a71	Merge pull request #404 from linuxserver/cleanup-nginx-develop Cleanup default site conf	2024-01-02 10:10:21 -06:00
Eric Nemchik	7a4dc0aa13	Update readme date Signed-off-by: GitHub <noreply@github.com>	2024-01-02 16:07:05 +00:00
Eric Nemchik	56461a34b3	Cleanup default site conf Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-02 16:05:58 +00:00
LinuxServer-CI	f131871e4c	Bot Updating Package Versions	2024-01-02 11:49:44 +00:00
Adam	aae9593ea7	Merge pull request #396 from linuxserver/develop-mime Avoid duplicate mime definition	2023-12-22 22:39:46 +00:00
TheSpad	4178035a55	Consistent formatting	2023-12-22 17:16:22 +00:00
TheSpad	0ad8c52d56	Use text/javascript as per rfc9239	2023-12-22 17:15:18 +00:00
TheSpad	37eb7522e1	Prefer application/javascript	2023-12-22 17:08:14 +00:00
TheSpad	794f71483a	Avoid duplicate mime definition	2023-12-22 17:01:35 +00:00
LinuxServer-CI	b22dc7887a	Bot Updating Package Versions	2023-12-22 16:33:56 +00:00
Adam	408d92a2ec	Merge pull request #393 from linuxserver/develop-conf-mjs sync with upstream nextcloud docs	2023-12-22 16:28:28 +00:00
TheSpad	c3c64ae5d5	sync with upstream nextcloud docs	2023-12-22 16:03:20 +00:00
LinuxServer-CI	bf1947d7ad	Bot Updating Package Versions	2023-12-12 11:50:00 +00:00
LinuxServer-CI	94fd873ece	Bot Updating Package Versions	2023-12-07 21:34:08 +00:00
LinuxServer-CI	61f34bacdc	Bot Updating Package Versions	2023-12-05 11:50:04 +00:00
LinuxServer-CI	21f2fc0840	Bot Updating Package Versions	2023-11-30 21:34:34 +00:00
Eric Nemchik	2bdf249bf1	Merge pull request #383 from linuxserver/quiet-migration-develop only run migration if conf exists	2023-11-29 08:30:52 -06:00
LinuxServer-CI	e2d34baa3f	Bot Updating Package Versions	2023-11-28 11:52:19 +00:00
Eric Nemchik	be9ffb890e	only run migration if conf exists redirect stderr to /dev/null Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-25 10:49:42 -06:00
LinuxServer-CI	f62cc3b9e8	Bot Updating Package Versions	2023-11-21 11:49:54 +00:00
Eric Nemchik	45d68d0508	Merge pull request #357 from linuxserver/standard-cron-develop standard cron develop	2023-11-18 19:09:15 -06:00
LinuxServer-CI	ba1ac62fd9	Bot Updating Package Versions	2023-11-16 21:36:06 +00:00
LinuxServer-CI	ca6afd353a	Bot Updating Templated Files	2023-11-16 21:31:08 +00:00
LinuxServer-CI	acb431bc9c	Bot Updating Package Versions	2023-11-14 23:32:43 +00:00
LinuxServer-CI	2639cc28cd	Bot Updating Package Versions	2023-11-14 11:49:59 +00:00
LinuxServer-CI	35919306ae	Bot Updating Package Versions	2023-11-10 14:35:17 +00:00
LinuxServer-CI	355c1b33c1	Bot Updating Package Versions	2023-11-02 16:40:23 +00:00
LinuxServer-CI	5bb6b49068	Bot Updating Package Versions	2023-10-28 19:59:43 +00:00
LinuxServer-CI	96ae53f2fc	Bot Updating Templated Files	2023-10-28 19:54:46 +00:00
Eric Nemchik	9755ecbbc5	Merge pull request #376 from linuxserver/disable-web-upgrade-develop Disable web upgrades using occ during init develop	2023-10-28 14:53:12 -05:00
Eric Nemchik	e07f1ae896	Disable web upgrades using occ during init Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-10-28 14:25:07 -05:00
LinuxServer-CI	a810a8f45f	Bot Updating Package Versions	2023-10-24 11:52:50 +00:00
LinuxServer-CI	4f772f8a0e	Bot Updating Package Versions	2023-10-17 11:50:15 +00:00
LinuxServer-CI	eb988dcf54	Bot Updating Package Versions	2023-10-12 21:34:51 +00:00
LinuxServer-CI	c8441d7681	Bot Updating Package Versions	2023-10-10 11:54:28 +00:00
LinuxServer-CI	3caf64eb7e	Bot Updating Templated Files	2023-10-10 11:50:24 +00:00
LinuxServer-CI	49474850dc	Bot Updating Templated Files	2023-10-10 11:48:50 +00:00
LinuxServer-CI	373ee2efc0	Bot Updating Package Versions	2023-09-29 00:41:10 +00:00
Eric Nemchik	56ae57320b	Merge pull request #359 from linuxserver/develop-updatenotification-app Re-add updatenotification app	2023-09-28 19:36:15 -05:00
LinuxServer-CI	26c0913d86	Bot Updating Package Versions	2023-09-28 14:38:09 +00:00
LinuxServer-CI	525efaa99a	Bot Updating Package Versions	2023-09-26 11:50:04 +00:00
quietsy	50c57a68f9	Merge pull request #365 from linuxserver/fix-lsiown-develop Fix lsiown -R order	2023-09-18 16:57:26 +03:00
quietsy	a1a8f070f1	Fix lsiown -R order	2023-09-18 16:39:12 +03:00
LinuxServer-CI	9f953af7ad	Bot Updating Package Versions	2023-09-14 18:33:10 +00:00
LinuxServer-CI	4d74174b8c	Bot Updating Package Versions	2023-09-12 09:35:12 +00:00
LinuxServer-CI	db66b6a2cc	Bot Updating Package Versions	2023-09-07 14:33:34 +00:00
LinuxServer-CI	92378267ac	Bot Updating Package Versions	2023-09-05 11:50:04 +00:00
LinuxServer-CI	7f08b006fe	Bot Updating Package Versions	2023-08-31 15:33:10 +00:00
Eric Nemchik	cea5b826cc	Re-add updatenotification app Closes https://github.com/linuxserver/docker-nextcloud/issues/356 Signed-off-by: GitHub <noreply@github.com>	2023-08-31 14:00:49 +00:00
LinuxServer-CI	e7cdf18d23	Bot Updating Package Versions	2023-08-29 11:51:13 +00:00
Eric Nemchik	74f9122ab6	Merge branch 'standard-cron' into standard-cron-develop	2023-08-26 09:59:51 -05:00
LinuxServer-CI	d935187cb3	Bot Updating Package Versions	2023-08-22 11:50:11 +00:00
Eric Nemchik	e25b4e3b4f	Move crontabs to etc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-19 10:17:19 -05:00
Eric Nemchik	a7471ca097	Remove root cron sed Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-19 08:41:47 -05:00
Eric Nemchik	31e9e86b4f	cron in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-18 23:38:05 -05:00
LinuxServer-CI	24cb0878c4	Bot Updating Package Versions	2023-08-15 11:57:10 +00:00
LinuxServer-CI	d641ed8dba	Bot Updating Package Versions	2023-08-15 11:52:53 +00:00
quietsy	9651cce68c	Merge pull request #352 from linuxserver/initial-develop Add develop branch	2023-08-15 09:27:38 +03:00
quietsy	a7f9b4c842	Add develop branch	2023-08-15 08:52:29 +03:00
LinuxServer-CI	ecb0c736a1	Bot Updating Package Versions	2023-08-15 03:26:31 +00:00
LinuxServer-CI	a68f0f6925	Bot Updating Package Versions	2023-08-15 03:22:55 +00:00
LinuxServer-CI	9c74d389e8	Bot Updating Package Versions	2023-08-15 03:19:37 +00:00
Eric Nemchik	679d4f2c41	Merge pull request #353 from linuxserver/remove-updatenotification Remove updatenotification	2023-08-14 22:16:03 -05:00
Eric Nemchik	fd7d9d1f0a	Run silent Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-14 20:06:34 -05:00
Eric Nemchik	ea2517e26d	Remove updatenotification Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-08-14 20:00:33 -05:00
LinuxServer-CI	d2fd6fc539	Bot Updating Package Versions	2023-08-14 14:04:59 +00:00
LinuxServer-CI	7ed49f352e	Bot Updating Package Versions	2023-08-08 11:50:05 +00:00
LinuxServer-CI	e916f5b8e7	Bot Updating Package Versions	2023-08-01 11:49:55 +00:00
Eric Nemchik	0d3c4888b0	Fix perms Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-07-30 09:49:46 -05:00
Eric Nemchik	e022624194	standard cron Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-07-30 01:16:35 -05:00
LinuxServer-CI	e5eda5af76	Bot Updating Templated Files	2023-07-26 16:44:03 +00:00
Eric Nemchik	b9be60fa7f	Merge pull request #341 from linuxserver/custom-apps Add instructions for custom apps	2023-07-26 11:42:34 -05:00
Eric Nemchik	ea8ec3f7de	Add instructions for custom apps Signed-off-by: GitHub <noreply@github.com>	2023-07-25 16:05:01 +00:00
LinuxServer-CI	1f55fe6c33	Bot Updating Package Versions	2023-07-25 11:52:43 +00:00
LinuxServer-CI	aeba9df4db	Bot Updating Package Versions	2023-07-20 15:33:40 +00:00
Eric Nemchik	a4f984a7d9	Merge pull request #333 from linuxserver/php-nginx-defaults Set php defaults to match nginx	2023-07-18 13:54:16 -05:00
LinuxServer-CI	2754ea55c9	Bot Updating Package Versions	2023-07-18 11:52:08 +00:00
Eric Nemchik	0e7b613aea	Set php defaults to match nginx Signed-off-by: GitHub <noreply@github.com>	2023-07-12 20:37:55 +00:00
LinuxServer-CI	8be7743ecf	Bot Updating Package Versions	2023-07-11 11:53:00 +00:00
Eric Nemchik	191b544762	Merge pull request #325 from linuxserver/data-directory Set datadirectory and fix integrity check	2023-07-04 21:08:03 -05:00
LinuxServer-CI	e21472ef48	Bot Updating Package Versions	2023-07-04 11:54:08 +00:00
LinuxServer-CI	818caffc53	Bot Updating Templated Files	2023-07-04 11:48:41 +00:00
Eric Nemchik	d151fd013f	Remove disabled apps logic (was broken) Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-27 18:19:21 -05:00
Eric Nemchik	e3d0f3fff2	If there are no apps then needs installs Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-27 18:14:37 -05:00
Eric Nemchik	06ca2ef0a1	Remove shipped apps for upgrade Prevents integrity check issue Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-26 19:03:54 -05:00
Adam	bb420b03b9	Merge pull request #326 from linuxserver/dd-fix	2023-06-26 21:03:47 +01:00
TheSpad	ee61df9ca5	Fix order of operations	2023-06-26 16:29:21 +01:00
Eric Nemchik	d1c323e579	Set data directory during init Signed-off-by: GitHub <noreply@github.com>	2023-06-26 14:15:22 +00:00
LinuxServer-CI	dec08a2484	Bot Updating Package Versions	2023-06-25 17:20:40 +00:00
Eric Nemchik	405337b30e	Merge pull request #317 from linuxserver/internal Move Nextcloud installation inside container	2023-06-25 12:16:57 -05:00
Eric Nemchik	fa12222577	Update cstate date Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-25 09:02:43 -05:00
Eric Nemchik	8a07cc6f8d	Update dates Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-23 12:45:57 -05:00
Eric Nemchik	aaa5539e72	Setup APCu for file locking Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-23 08:02:59 -05:00
Eric Nemchik	26a0540cd1	Merge remote-tracking branch 'origin/master' into internal Signed-off-by: GitHub <noreply@github.com>	2023-06-21 14:12:36 +00:00
LinuxServer-CI	448bf5eb1a	Bot Updating Package Versions	2023-06-21 14:12:01 +00:00
LinuxServer-CI	62992f0a4f	Bot Updating Templated Files	2023-06-21 14:08:34 +00:00
LinuxServer-CI	9de2e2726b	Bot Updating Templated Files	2023-06-21 14:06:28 +00:00
LinuxServer-CI	cfdf78c382	Bot Updating Templated Files	2023-06-21 14:03:50 +00:00
Eric Nemchik	16c9be663b	Fix changelog date	2023-06-21 09:02:31 -05:00
LinuxServer-CI	c1e8491006	Bot Updating Templated Files	2023-06-21 14:01:23 +00:00
Eric Nemchik	c8531b1ade	Merge pull request #321 from linuxserver/real-ip-fix Use proper local CIDR with real IP setting	2023-06-21 09:00:03 -05:00
Eric Nemchik	b2848f6d90	Update readme-vars.yml	2023-06-21 08:51:52 -05:00
Eric Nemchik	e893e147e7	Update default.conf.sample	2023-06-21 08:51:10 -05:00
Eric Nemchik	e970b42dc3	Use proper local CIDR with real IP setting	2023-06-21 08:39:02 -05:00
LinuxServer-CI	d596203d7e	Bot Updating Package Versions	2023-06-20 11:49:48 +00:00
Eric Nemchik	6bdb726b5c	Update readme Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-19 11:25:57 -05:00
Eric Nemchik	002d482a4b	Update new install logic	2023-06-18 14:20:21 -05:00
Eric Nemchik	b985143d6c	Rework install/upgrade logic Persist needs_migration in case init sleeps Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-18 08:59:02 -05:00
Eric Nemchik	11256def46	Fix max upgrade check Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-17 21:39:41 -05:00
Eric Nemchik	038280e26e	Add max upgrade check Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-17 21:37:15 -05:00
Eric Nemchik	cbda0f1b45	Adjust update wording Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 17:09:57 -05:00
Eric Nemchik	f45714f6a0	Add output about taking a long time Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 15:57:13 -05:00
Eric Nemchik	19ffc43845	Account for missing install Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 15:01:05 -05:00
Eric Nemchik	8e814fad1a	Rework installed version check (again) Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 14:33:58 -05:00
Eric Nemchik	4eb5de15be	Use full file path for cron replacement Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 14:03:46 -05:00
Eric Nemchik	1859718b5b	Replace crontab during migration Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 14:01:49 -05:00
Eric Nemchik	e0b9378984	Remove incomplete memcached config Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-16 13:57:04 -05:00
LinuxServer-CI	5d694d9848	Bot Updating Package Versions	2023-06-13 11:53:14 +00:00
Eric Nemchik	99c22a9646	Data is separate Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 11:13:42 -05:00
Eric Nemchik	1aa1f053bf	rsync persistent data to config Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 11:06:21 -05:00
Eric Nemchik	a87e7408b0	Refactor chown Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 11:05:37 -05:00
Eric Nemchik	0bccfaed5d	Include apps in upgrade exclusion Only excluded if not empty Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 10:49:29 -05:00
Eric Nemchik	04e3db14fd	Symlink apps rather than using custom_apps Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 10:47:51 -05:00
Eric Nemchik	50300ca085	Don't consider version installed inside Only consider version on persistent config Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 10:41:36 -05:00
Eric Nemchik	b914cfdf0b	Don't copy defaults The install and symlink handles this Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 09:53:52 -05:00
Eric Nemchik	f5ea4e4b4e	Account for persistent config version Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 09:24:28 -05:00
Eric Nemchik	95a5440b64	Fix config format Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 01:00:34 -05:00
Eric Nemchik	53f5177687	Only run occ config if installed Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 00:39:33 -05:00
Eric Nemchik	e1f2335825	Additional permission fixes Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 00:26:58 -05:00
Eric Nemchik	bddeebb953	Fix symlink breaking Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-07 00:18:14 -05:00
Eric Nemchik	beac2d82ef	Redirect output Doesn't need to be in container log Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 23:44:28 -05:00
Eric Nemchik	57c6197dbe	Run occ after install Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 23:26:11 -05:00
Eric Nemchik	91f7977eff	setup config Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 23:00:47 -05:00
Eric Nemchik	d1ddb603b0	Don't delete extra files with rsync Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 19:07:55 -05:00
Eric Nemchik	7cc124486a	Rearrange init order again Symlink user folders before reading datadirectory Symlink datadirectory separately Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 18:45:12 -05:00
Eric Nemchik	2924be9081	Cleanup migrated files Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 18:22:21 -05:00
Eric Nemchik	4646cd7d45	Reorder init logic again Migrate before symlink Don't copy persistent data into container Fix datadirectory file Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 15:42:21 -05:00
Eric Nemchik	14bc5e1aa5	Migrate after creating symlinks Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 15:00:12 -05:00
Eric Nemchik	799bf398a5	Fix Dockerfile syntax Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 14:42:07 -05:00
Eric Nemchik	21291a365f	Move Nextcloud installation inside container Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-06-06 14:37:17 -05:00
LinuxServer-CI	9536207521	Bot Updating Package Versions	2023-06-06 11:49:39 +00:00
LinuxServer-CI	c07466d60a	Bot Updating Package Versions	2023-05-31 12:22:44 +00:00
Eric Nemchik	034a746e14	Merge pull request #311 from linuxserver/3.18 Rebase to Alpine 3.18, deprecate armhf	2023-05-31 07:19:54 -05:00
LinuxServer-CI	d642269a03	Bot Updating Package Versions	2023-05-30 11:51:18 +00:00
Eric Nemchik	98cf4a44c9	Rebase to Alpine 3.18, deprecate armhf	2023-05-27 16:54:39 -05:00
LinuxServer-CI	f537f6f127	Bot Updating Package Versions	2023-05-25 19:33:32 +00:00
LinuxServer-CI	3d3039dd60	Bot Updating Package Versions	2023-05-23 11:52:44 +00:00
LinuxServer-CI	c4de665eff	Bot Updating Templated Files	2023-05-23 11:48:56 +00:00
LinuxServer-CI	b6f1034488	Bot Updating Package Versions	2023-05-16 11:49:48 +00:00
LinuxServer-CI	74805eac37	Bot Updating Package Versions	2023-05-09 12:48:46 +00:00
LinuxServer-CI	a90a7743ce	Bot Updating Package Versions	2023-05-02 11:49:03 +00:00
aptalca	bce2ec1945	Merge pull request #308 from linuxserver/version-trigger update version command	2023-04-26 14:51:21 -04:00
aptalca	4c04b3eb32	update version command	2023-04-25 15:21:02 -04:00
LinuxServer-CI	a2a6a75f29	Bot Updating Package Versions	2023-04-25 11:48:57 +00:00
Eric Nemchik	ddd081b78e	Merge pull request #305 from linuxserver/move-ssl-include Move ssl.conf include to default.conf	2023-04-17 11:06:19 -05:00
LinuxServer-CI	677dc7a242	Bot Updating Package Versions	2023-04-17 10:57:43 -05:00
Eric Nemchik	1b02609aca	Merge pull request #306 from linuxserver/community-php81-pecl-smbclient Install php81-pecl-smbclient from community	2023-04-17 10:53:51 -05:00
Eric Nemchik	535e2f5549	Install php81-pecl-smbclient from community https://gitlab.alpinelinux.org/alpine/aports/-/commit/512d38d0d2b78cbe51e0a3cd983bdc476f4f91f7	2023-04-17 15:31:39 +00:00
Eric Nemchik	7ea5b546e0	Move ssl.conf include to default.conf	2023-04-13 11:05:57 -05:00
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-crontabs-config/run`