Bot Updating Package Versions

Bot Updating Templated Files
2026-02-19 23:03:50 +08:00 · 2024-01-18 17:36:47 +00:00 · 2024-01-16 11:56:53 +00:00 · 2024-01-16 11:50:34 +00:00 · 2024-01-16 11:48:58 +00:00 · 2024-01-09 11:50:08 +00:00
15 changed files with 810 additions and 696 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -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:
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -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
 ------------------------------
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@ -4,26 +4,26 @@ on:
  workflow_dispatch:
 jobs:
-  external-trigger-master:
+  external-trigger-develop:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3.1.0
      - 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
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            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 master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          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 | jq -r '.[] | select(.prerelease != true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1)
+          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"}],
@ -35,7 +35,7 @@ jobs:
          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')
@ -61,7 +61,7 @@ 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 }}
@ -73,7 +73,7 @@ jobs:
            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
@ -81,7 +81,7 @@ jobs:
            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 ****"
@ -97,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 }}
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@ -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 }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@ -4,28 +4,28 @@ on:
  workflow_dispatch:
 jobs:
-  package-trigger-master:
+  package-trigger-develop:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3.1.0
      - 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
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            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 master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          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 ****"
--- a/4
+++ b/4
@ -82,12 +82,12 @@ RUN \
    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
  curl -o \
    /tmp/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+    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 && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -82,12 +82,12 @@ RUN \
    /app/www/src/ && \
  if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \
    NEXTCLOUD_RELEASE=$(curl -sX GET https://api.github.com/repos/nextcloud/server/releases \
-      | jq -r '.[] | select(.prerelease != true) | .tag_name' \
+      | jq -r '.[] | select(.prerelease == true) | .tag_name' \
      | sed 's|^v||g' | sort -rV | head -1); \
  fi && \
  curl -o \
    /tmp/nextcloud.tar.bz2 -L \
-    https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \
+    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 && \
--- a/434
+++ b/434
@ -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'
@ -48,7 +48,7 @@ pipeline {
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}: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' ''',
@ -59,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' ''',
@ -72,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
@ -110,7 +115,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            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 ''',
+            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'
        }
@ -121,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+)/
@ -139,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}")
@ -150,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 {
@ -163,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 + '|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.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          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 {
@ -186,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 + '|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.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@ -209,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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-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 + '-dev-' + env.COMMIT_SHA + '-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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.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/'
        }
@ -250,129 +255,164 @@ 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
        }
      }
      steps {
-        sh '''#! /bin/bash
+        withCredentials([
-              set -e
+          [
-              TEMPDIR=$(mktemp -d)
+            $class: 'UsernamePasswordMultiBinding',
-              docker pull ghcr.io/linuxserver/jenkins-builder:latest
+            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+            usernameVariable: 'DOCKERUSER',
-              # Stage 1 - Jenkinsfile update
+            passwordVariable: 'DOCKERPASS'
-              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}
+          sh '''#! /bin/bash
-                cd ${TEMPDIR}/repo/${LS_REPO}
+                set -e
-                git checkout -f master
+                TEMPDIR=$(mktemp -d)
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                git add Jenkinsfile
+                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=develop -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-                git commit -m 'Bot Updating Templated Files'
+                # Stage 1 - Jenkinsfile update
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                  mkdir -p ${TEMPDIR}/repo
-                echo "Updating Jenkinsfile"
+                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                rm -Rf ${TEMPDIR}
+                  cd ${TEMPDIR}/repo/${LS_REPO}
-                exit 0
+                  git checkout -f develop
-              else
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                echo "Jenkinsfile is up to date."
+                  git add Jenkinsfile
-              fi
+                  git commit -m 'Bot Updating Templated Files'
-              # Stage 2 - Delete old templates
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
-              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"
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
-              for i in ${OLD_TEMPLATES}; do
+                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                if [[ -f "${i}" ]]; then
+                  echo "Updating Jenkinsfile"
-                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                  rm -Rf ${TEMPDIR}
-                fi
+                  exit 0
              done
              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; 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
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Deleting old and deprecated templates"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "No templates to delete"
              fi
              # 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)
              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; 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
                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 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
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
              else
                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
              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
                git commit -m 'Bot Updating Documentation'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
              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
                cd ${TEMPDIR}/unraid/templates/
                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/
                  git add -u unraid/${CONTAINER_NAME}.xml
                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                else
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  echo "Jenkinsfile is up to date."
                  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
+                # Stage 2 - Delete old templates
-              fi
+                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"
-              rm -Rf ${TEMPDIR}'''
+                for i in ${OLD_TEMPLATES}; do
-        script{
+                  if [[ -f "${i}" ]]; then
-          env.FILES_UPDATED = sh(
+                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
-            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+                  fi
-            returnStdout: true).trim()
+                done
                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; 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 develop
                  for i in ${TEMPLATES_TO_DELETE}; do
                    git rm "${i}"
                  done
                  git commit -m 'Bot Updating Templated Files'
                  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"
                  rm -Rf ${TEMPDIR}
                  exit 0
                else
                  echo "No templates to delete"
                fi
                # 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)
                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; 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 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 readme-vars.yml ${TEMPLATED_FILES}
                  git commit -m 'Bot Updating Templated Files'
                  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}
                else
                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                fi
                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
                  git commit -m 'Bot Updating Documentation'
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
                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}" == "${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
                  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/
                    git add -u unraid/${CONTAINER_NAME}.xml
                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
                  else
                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                    git add unraid/${CONTAINER_NAME}.xml
                    git commit -m 'Bot Updating Unraid Template'
                  fi
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                fi
                # Stage 4 - Sync Readme to Docker Hub
                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 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
                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "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{
            env.FILES_UPDATED = sh(
              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
              returnStdout: true).trim()
          }
        }
      }
    }
    // 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 {
@ -385,10 +425,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build check the S6 service file perms
+    // If this is a develop build check the S6 service file perms
    stage("Check S6 Service file Permissions"){
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@ -425,35 +465,6 @@ pipeline {
             "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
              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
           '''
      } 
    }
    /* ###############
       Build Container
       ############### */
@ -559,7 +570,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: ''
      }
@ -582,13 +593,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
@ -606,7 +618,7 @@ 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: ''
@ -620,7 +632,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: ''
@ -713,12 +725,12 @@ pipeline {
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}: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
@ -764,10 +776,10 @@ pipeline {
                  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}: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}
@ -775,17 +787,17 @@ pipeline {
                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-latest
+                    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}:arm64v8-${SEMVER}
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
+                    docker manifest push --purge ${MANIFESTIMAGE}:develop || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                    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}:arm64v8-${META_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
@ -801,13 +813,13 @@ pipeline {
                    digest=$(curl -s \
                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-develop")
                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-develop ${MANIFESTIMAGE}:amd64-develop
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
+                    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
@ -822,7 +834,7 @@ pipeline {
    // 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
        }
@ -834,52 +846,54 @@ 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
+    // Add protection to the release branch
-    stage('Sync-README') {
+    stage('Github-Release-Branch-Protection') {
      when {
        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
+        echo "Setting up protection for release branch develop"
-          [
+        sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/develop/protection \
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+          -d $(jq -c .  << EOF
-            usernameVariable: 'DOCKERUSER',
+            {
-            passwordVariable: 'DOCKERPASS'
+              "required_status_checks": null,
-          ]
+              "enforce_admins": false,
-        ]) {
+              "required_pull_request_reviews": {
-          sh '''#! /bin/bash
+                "dismiss_stale_reviews": false,
-                set -e
+                "require_code_owner_reviews": false,
-                TEMPDIR=$(mktemp -d)
+                "require_last_push_approval": false,
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                "required_approving_review_count": 1
-                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
+              "restrictions": null,
-                docker run --rm=true \
+              "required_linear_history": false,
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+              "allow_force_pushes": false,
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+              "allow_deletions": false,
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+              "block_creations": false,
-                  -e DOCKER_REPOSITORY=${IMAGE} \
+              "required_conversation_resolution": true,
-                  -e GIT_BRANCH=master \
+              "lock_branch": false,
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+              "allow_fork_syncing": false,
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+              "required_signatures": false
-                rm -Rf ${TEMPDIR} '''
+            }
-        }
+EOF
          ) '''
      }
    }
    // If this is a Pull request send the CI link as a comment on it
--- a/README.md
+++ b/README.md
@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read the https://github.com/linuxserver/docker-nextcloud/blob/master/.github/CONTRIBUTING.md -->
+<!-- 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:
@ -60,6 +59,15 @@ The architectures supported by this image are:
 | arm64 | ✅ | arm64v8-\<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/).
@ -96,16 +104,15 @@ 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
@ -131,13 +138,12 @@ docker run -d \
  -v /path/to/appdata:/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 |
 | :----: | --- |
@ -155,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
@ -167,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
+id your_user
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
 Example output:
 ```text
 uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 ## Docker Mods
@ -186,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`
+* Shell access whilst the container is running:
-* To monitor the logs of the container in realtime: `docker logs -f nextcloud`
+
-* container version number
+    ```bash
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nextcloud`
+    docker exec -it nextcloud /bin/bash
-* image version number
+    ```
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:latest`
+
 * 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`
+* Update images:
-  * or update a single image: `docker-compose pull nextcloud`
+    * All images:
-* Let compose update all containers as necessary: `docker-compose up -d`
+
-  * or update a single container: `docker-compose up -d nextcloud`
+        ```bash
-* You can also remove the old dangling images: `docker image prune`
+        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`
+* Update the image:
-* Stop the running container: `docker stop nextcloud`
+
-* Delete the container: `docker rm nextcloud`
+    ```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)
+    ```bash
-
+    docker image prune
-* 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).
 ### 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
@ -244,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`
@ -257,6 +315,11 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 ## Versions
 * **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.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,10 +3,10 @@
 # jenkins variables
 project_name: docker-nextcloud
 external_type: na
-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"
+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: stable
+release_type: prerelease
-release_tag: latest
+release_tag: develop
-ls_branch: master
+ls_branch: develop
 build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
--- a/package_versions.txt
+++ b/package_versions.txt
@ -1,378 +1,385 @@
-NAME                                VERSION                          TYPE         
+NAME                                 VERSION                          TYPE         
-alpine-baselayout                   3.4.3-r1                         apk           
+@nextcloud/text                      28.0.0-dev.1                     npm           
-alpine-baselayout-data              3.4.3-r1                         apk           
+Process Wrapper                      0.0.0.0                          dotnet        
-alpine-keys                         2.4-r1                           apk           
+activity                             2.20.0                           npm           
-alpine-release                      3.18.2-r0                        apk           
+alpine-baselayout                    3.4.3-r1                         apk           
-alsa-lib                            1.2.9-r1                         apk           
+alpine-baselayout-data               3.4.3-r1                         apk           
-amphp/amp                           v2.6.2                           php-composer  
+alpine-keys                          2.4-r1                           apk           
-amphp/byte-stream                   v1.8.1                           php-composer  
+alpine-release                       3.18.5-r0                        apk           
-amphp/parallel                      v1.4.3                           php-composer  
+alsa-lib                             1.2.9-r1                         apk           
-amphp/parser                        v1.1.0                           php-composer  
+amphp/amp                            v2.6.2                           php-composer  
-amphp/process                       v1.1.4                           php-composer  
+amphp/byte-stream                    v1.8.1                           php-composer  
-amphp/serialization                 v1.0.0                           php-composer  
+amphp/parallel                       v1.4.3                           php-composer  
-amphp/sync                          v1.4.2                           php-composer  
+amphp/parser                         v1.1.0                           php-composer  
-aom-libs                            3.6.1-r0                         apk           
+amphp/process                        v1.1.4                           php-composer  
-apache2-utils                       2.4.57-r3                        apk           
+amphp/serialization                  v1.0.0                           php-composer  
-apk-tools                           2.14.0-r2                        apk           
+amphp/sync                           v1.4.2                           php-composer  
-apr                                 1.7.4-r0                         apk           
+aom-libs                             3.6.1-r0                         apk           
-apr-util                            1.6.3-r1                         apk           
+apache2-utils                        2.4.58-r0                        apk           
-argon2-libs                         20190702-r4                      apk           
+apk-tools                            2.14.0-r2                        apk           
-avahi-libs                          0.8-r13                          apk           
+apr                                  1.7.4-r0                         apk           
-aws/aws-crt-php                     v1.0.2                           php-composer  
+apr-util                             1.6.3-r1                         apk           
-aws/aws-sdk-php                     3.240.8                          php-composer  
+argon2-libs                          20190702-r4                      apk           
-bantu/ini-get-wrapper               v1.0.1                           php-composer  
+avahi-libs                           0.8-r13                          apk           
-bash                                5.2.15-r5                        apk           
+aws/aws-crt-php                      v1.0.2                           php-composer  
-beberlei/assert                     v3.3.1                           php-composer  
+aws/aws-sdk-php                      3.240.8                          php-composer  
-brick/math                          0.9.2                            php-composer  
+bantu/ini-get-wrapper                v1.0.1                           php-composer  
-brotli-libs                         1.0.9-r14                        apk           
+bash                                 5.2.15-r5                        apk           
-busybox                             1.36.1                           binary        
+beberlei/assert                      v3.3.1                           php-composer  
-busybox                             1.36.1-r1                        apk           
+brick/math                           0.9.2                            php-composer  
-busybox-binsh                       1.36.1-r1                        apk           
+brotli-libs                          1.0.9-r14                        apk           
-c-client                            2007f-r15                        apk           
+bruteforcesettings                   2.8.0                            npm           
-ca-certificates                     20230506-r0                      apk           
+busybox                              1.36.1-r5                        apk           
-ca-certificates-bundle              20230506-r0                      apk           
+busybox-binsh                        1.36.1-r5                        apk           
-cairo                               1.17.8-r1                        apk           
+c-client                             2007f-r15                        apk           
-cairo-gobject                       1.17.8-r1                        apk           
+ca-certificates                      20230506-r0                      apk           
-christian-riesen/base32             1.6.0                            php-composer  
+ca-certificates-bundle               20230506-r0                      apk           
-christophwurst/id3parser            v0.1.4                           php-composer  
+cairo                                1.17.8-r1                        apk           
-cjson                               1.7.15-r4                        apk           
+cairo-gobject                        1.17.8-r1                        apk           
-coreutils                           9.3-r1                           apk           
+christian-riesen/base32              1.6.0                            php-composer  
-cups-libs                           2.4.6-r0                         apk           
+cjson                                1.7.17-r0                        apk           
-curl                                8.1.2-r0                         apk           
+composer                             2.6.6                            binary        
-cweagans/composer-patches           1.7.1                            php-composer  
+coreutils                            9.3-r1                           apk           
-darsyn/ip                           4.1.0                            php-composer  
+cups-libs                            2.4.7-r0                         apk           
-dbus-libs                           1.14.8-r0                        apk           
+curl                                 8.5.0-r0                         apk           
-deepdiver/zipstreamer               2.0.0                            php-composer  
+cweagans/composer-patches            1.7.3                            php-composer  
-deepdiver1975/tarstreamer           2.0.0                            php-composer  
+darsyn/ip                            4.1.0                            php-composer  
-doctrine/cache                      2.2.0                            php-composer  
+dbus-libs                            1.14.8-r0                        apk           
-doctrine/dbal                       3.3.8                            php-composer  
+deepdiver/zipstreamer                2.0.0                            php-composer  
-doctrine/deprecations               v1.0.0                           php-composer  
+deepdiver1975/tarstreamer            v2.1.0                           php-composer  
-doctrine/event-manager              1.2.0                            php-composer  
+doctrine/cache                       2.2.0                            php-composer  
-doctrine/lexer                      1.2.3                            php-composer  
+doctrine/dbal                        3.7.0                            php-composer  
-egulias/email-validator             3.2.5                            php-composer  
+doctrine/deprecations                1.1.2                            php-composer  
-ffmpeg                              6.0-r15                          apk           
+doctrine/event-manager               1.2.0                            php-composer  
-ffmpeg-libavcodec                   6.0-r15                          apk           
+doctrine/lexer                       1.2.3                            php-composer  
-ffmpeg-libavdevice                  6.0-r15                          apk           
+egulias/email-validator              3.2.5                            php-composer  
-ffmpeg-libavfilter                  6.0-r15                          apk           
+ffmpeg                               6.0.1-r0                         apk           
-ffmpeg-libavformat                  6.0-r15                          apk           
+ffmpeg-libavcodec                    6.0.1-r0                         apk           
-ffmpeg-libavutil                    6.0-r15                          apk           
+ffmpeg-libavdevice                   6.0.1-r0                         apk           
-ffmpeg-libpostproc                  6.0-r15                          apk           
+ffmpeg-libavfilter                   6.0.1-r0                         apk           
-ffmpeg-libswresample                6.0-r15                          apk           
+ffmpeg-libavformat                   6.0.1-r0                         apk           
-ffmpeg-libswscale                   6.0-r15                          apk           
+ffmpeg-libavutil                     6.0.1-r0                         apk           
-fgrosse/phpasn1                     v2.3.0                           php-composer  
+ffmpeg-libpostproc                   6.0.1-r0                         apk           
-flac-libs                           1.4.3-r0                         apk           
+ffmpeg-libswresample                 6.0.1-r0                         apk           
-fontconfig                          2.14.2-r3                        apk           
+ffmpeg-libswscale                    6.0.1-r0                         apk           
-freetype                            2.13.0-r5                        apk           
+fgrosse/phpasn1                      v2.3.0                           php-composer  
-fribidi                             1.0.13-r0                        apk           
+files_pdfviewer                      2.9.0                            npm           
-fusonic/linq                        v1.1.0                           php-composer  
+firstrunwizard                       2.17.0                           npm           
-fusonic/opengraph                   v2.2.0                           php-composer  
+flac-libs                            1.4.3-r0                         apk           
-gdbm                                1.23-r1                          apk           
+fontconfig                           2.14.2-r3                        apk           
-gdk-pixbuf                          2.42.10-r5                       apk           
+freetype                             2.13.0-r5                        apk           
-ghostscript                         10.01.2-r0                       apk           
+fribidi                              1.0.13-r0                        apk           
-giggsey/libphonenumber-for-php      8.13.7                           php-composer  
+fusonic/linq                         v1.1.0                           php-composer  
-giggsey/locale                      2.3                              php-composer  
+fusonic/opengraph                    v2.2.0                           php-composer  
-git                                 2.40.1-r0                        apk           
+gdbm                                 1.23-r1                          apk           
-glib                                2.76.4-r0                        apk           
+gdk-pixbuf                           2.42.10-r5                       apk           
-glslang-libs                        1.3.243.0-r1                     apk           
+ghostscript                          10.02.0-r0                       apk           
-gmp                                 6.2.1-r3                         apk           
+giggsey/libphonenumber-for-php-lite  8.13.12                          php-composer  
-gnu-libiconv                        1.17-r1                          apk           
+git                                  2.40.1-r0                        apk           
-gnu-libiconv-libs                   1.17-r1                          apk           
+glib                                 2.76.4-r0                        apk           
-gnutls                              3.8.0-r2                         apk           
+glslang-libs                         1.3.243.0-r1                     apk           
-graphite2                           1.3.14-r5                        apk           
+gmp                                  6.2.1-r3                         apk           
-guzzlehttp/guzzle                   7.5.0                            php-composer  
+gnu-libiconv                         1.17-r1                          apk           
-guzzlehttp/promises                 1.5.2                            php-composer  
+gnu-libiconv-libs                    1.17-r1                          apk           
-guzzlehttp/psr7                     2.4.5                            php-composer  
+gnutls                               3.8.3-r0                         apk           
-guzzlehttp/uri-template             v0.2.0                           php-composer  
+graphite2                            1.3.14-r5                        apk           
-harfbuzz                            7.3.0-r0                         apk           
+guzzlehttp/guzzle                    7.5.0                            php-composer  
-hexogen/kdtree                      v0.2.5                           php-composer  
+guzzlehttp/promises                  1.5.2                            php-composer  
-hwdata-pci                          0.370-r0                         apk           
+guzzlehttp/psr7                      2.4.5                            php-composer  
-icewind/searchdav                   v3.0.1                           php-composer  
+guzzlehttp/uri-template              v0.2.0                           php-composer  
-icewind/smb                         v3.5.4                           php-composer  
+harfbuzz                             7.3.0-r0                         apk           
-icewind/streams                     v0.7.7                           php-composer  
+hexogen/kdtree                       v0.2.5                           php-composer  
-icu-data-en                         73.2-r2                          apk           
+hwdata-pci                           0.370-r0                         apk           
-icu-libs                            73.2-r2                          apk           
+icewind/searchdav                    v3.1.0                           php-composer  
-imagemagick                         7.1.1.13-r0                      apk           
+icewind/smb                          v3.5.4                           php-composer  
-imagemagick-libs                    7.1.1.13-r0                      apk           
+icewind/streams                      v0.7.7                           php-composer  
-jansson                             2.14-r3                          apk           
+icu-data-en                          73.2-r2                          apk           
-jbig2dec                            0.19-r3                          apk           
+icu-libs                             73.2-r2                          apk           
-jq                                  1.6-r3                           apk           
+imagemagick                          7.1.1.13-r1                      apk           
-justinrainbow/json-schema           5.2.10                           php-composer  
+imagemagick-libs                     7.1.1.13-r1                      apk           
-lame-libs                           3.100-r5                         apk           
+jansson                              2.14-r3                          apk           
-laravel/serializable-closure        v1.2.2                           php-composer  
+jbig2dec                             0.19-r3                          apk           
-lcms2                               2.15-r2                          apk           
+jq                                   1.6-r4                           apk           
-ldb                                 2.7.2-r1                         apk           
+justinrainbow/json-schema            5.2.10                           php-composer  
-league/flysystem                    2.5.0                            php-composer  
+lame-libs                            3.100-r5                         apk           
-league/mime-type-detection          1.11.0                           php-composer  
+laravel/serializable-closure         v1.2.2                           php-composer  
-league/uri                          6.4.0                            php-composer  
+lcms2                                2.15-r2                          apk           
-league/uri-interfaces               2.2.0                            php-composer  
+ldb                                  2.7.2-r1                         apk           
-libacl                              2.3.1-r3                         apk           
+league/flysystem                     2.5.0                            php-composer  
-libarchive                          3.6.2-r2                         apk           
+league/mime-type-detection           1.11.0                           php-composer  
-libass                              0.17.1-r0                        apk           
+league/uri                           6.4.0                            php-composer  
-libasyncns                          0.8-r1                           apk           
+league/uri-interfaces                2.2.0                            php-composer  
-libattr                             2.5.1-r4                         apk           
+libacl                               2.3.1-r3                         apk           
-libavif                             0.11.1-r2                        apk           
+libarchive                           3.7.2-r0                         apk           
-libblkid                            2.38.1-r8                        apk           
+libass                               0.17.1-r0                        apk           
-libbluray                           1.3.4-r0                         apk           
+libasyncns                           0.8-r1                           apk           
-libbsd                              0.11.7-r1                        apk           
+libattr                              2.5.1-r4                         apk           
-libbz2                              1.0.8-r5                         apk           
+libavif                              0.11.1-r2                        apk           
-libc-utils                          0.7.2-r5                         apk           
+libblkid                             2.38.1-r8                        apk           
-libcap2                             2.69-r0                          apk           
+libbluray                            1.3.4-r0                         apk           
-libcrypto3                          3.1.1-r3                         apk           
+libbsd                               0.11.7-r1                        apk           
-libcurl                             8.1.2-r0                         apk           
+libbz2                               1.0.8-r5                         apk           
-libdav1d                            1.2.1-r0                         apk           
+libc-utils                           0.7.2-r5                         apk           
-libde265                            1.0.12-r0                        apk           
+libcap2                              2.69-r0                          apk           
-libdrm                              2.4.115-r4                       apk           
+libcrypto3                           3.1.4-r3                         apk           
-libedit                             20221030.3.1-r1                  apk           
+libcurl                              8.5.0-r0                         apk           
-libevent                            2.1.12-r6                        apk           
+libdav1d                             1.2.1-r0                         apk           
-libexpat                            2.5.0-r1                         apk           
+libde265                             1.0.15-r0                        apk           
-libffi                              3.4.4-r2                         apk           
+libdrm                               2.4.115-r4                       apk           
-libformw                            6.4_p20230506-r0                 apk           
+libedit                              20221030.3.1-r1                  apk           
-libgcc                              12.2.1_git20220924-r10           apk           
+libevent                             2.1.12-r6                        apk           
-libgomp                             12.2.1_git20220924-r10           apk           
+libexpat                             2.5.0-r1                         apk           
-libheif                             1.16.2-r0                        apk           
+libffi                               3.4.4-r2                         apk           
-libhwy                              1.0.4-r1                         apk           
+libformw                             6.4_p20230506-r0                 apk           
-libice                              1.1.1-r2                         apk           
+libgcc                               12.2.1_git20220924-r10           apk           
-libidn2                             2.3.4-r1                         apk           
+libgomp                              12.2.1_git20220924-r10           apk           
-libintl                             0.21.1-r7                        apk           
+libheif                              1.16.2-r0                        apk           
-libjpeg-turbo                       2.1.5.1-r3                       apk           
+libhwy                               1.0.4-r1                         apk           
-libjxl                              0.8.2-r0                         apk           
+libice                               1.1.1-r2                         apk           
-libldap                             2.6.5-r0                         apk           
+libidn2                              2.3.4-r1                         apk           
-libltdl                             2.4.7-r2                         apk           
+libintl                              0.21.1-r7                        apk           
-libmcrypt                           2.5.8-r10                        apk           
+libjpeg-turbo                        2.1.5.1-r3                       apk           
-libmd                               1.0.4-r2                         apk           
+libjxl                               0.8.2-r0                         apk           
-libmemcached-libs                   1.1.4-r1                         apk           
+libldap                              2.6.5-r0                         apk           
-libmount                            2.38.1-r8                        apk           
+libltdl                              2.4.7-r2                         apk           
-libncursesw                         6.4_p20230506-r0                 apk           
+libmd                                1.0.4-r2                         apk           
-libogg                              1.3.5-r4                         apk           
+libmemcached-libs                    1.1.4-r1                         apk           
-libopenmpt                          0.7.2-r0                         apk           
+libmount                             2.38.1-r8                        apk           
-libpanelw                           6.4_p20230506-r0                 apk           
+libncursesw                          6.4_p20230506-r0                 apk           
-libpciaccess                        0.17-r2                          apk           
+libogg                               1.3.5-r4                         apk           
-libplacebo                          5.264.1-r1                       apk           
+libopenmpt                           0.7.2-r0                         apk           
-libpng                              1.6.39-r3                        apk           
+libpanelw                            6.4_p20230506-r0                 apk           
-libpq                               15.3-r0                          apk           
+libpciaccess                         0.17-r2                          apk           
-libproc2                            4.0.3-r1                         apk           
+libplacebo                           5.264.1-r1                       apk           
-libpulse                            16.1-r10                         apk           
+libpng                               1.6.39-r3                        apk           
-libraw                              0.21.1-r1                        apk           
+libpq                                15.5-r0                          apk           
-librist                             0.2.7-r0                         apk           
+libproc2                             4.0.4-r0                         apk           
-librsvg                             2.56.3-r0                        apk           
+libpulse                             16.1-r10                         apk           
-libsasl                             2.1.28-r4                        apk           
+libraw                               0.21.1-r1                        apk           
-libsm                               1.2.4-r1                         apk           
+librist                              0.2.7-r0                         apk           
-libsmbclient                        4.18.5-r0                        apk           
+librsvg                              2.56.3-r0                        apk           
-libsndfile                          1.2.0-r2                         apk           
+libsasl                              2.1.28-r4                        apk           
-libsodium                           1.0.18-r3                        apk           
+libsm                                1.2.4-r1                         apk           
-libsrt                              1.5.2-r0                         apk           
+libsmbclient                         4.18.9-r0                        apk           
-libssh                              0.10.5-r0                        apk           
+libsndfile                           1.2.0-r2                         apk           
-libssl3                             3.1.1-r3                         apk           
+libsodium                            1.0.18-r3                        apk           
-libstdc++                           12.2.1_git20220924-r10           apk           
+libsrt                               1.5.2-r0                         apk           
-libtasn1                            4.19.0-r1                        apk           
+libssh                               0.10.5-r0                        apk           
-libtheora                           1.1.1-r17                        apk           
+libssl3                              3.1.4-r3                         apk           
-libunibreak                         5.1-r0                           apk           
+libstdc++                            12.2.1_git20220924-r10           apk           
-libunistring                        1.1-r1                           apk           
+libtasn1                             4.19.0-r1                        apk           
-libuuid                             2.38.1-r8                        apk           
+libtheora                            1.1.1-r17                        apk           
-libva                               2.18.0-r1                        apk           
+libunibreak                          5.1-r0                           apk           
-libvdpau                            1.5-r1                           apk           
+libunistring                         1.1-r1                           apk           
-libvorbis                           1.3.7-r1                         apk           
+libuuid                              2.38.1-r8                        apk           
-libvpx                              1.13.0-r1                        apk           
+libva                                2.18.0-r1                        apk           
-libwbclient                         4.18.5-r0                        apk           
+libvdpau                             1.5-r1                           apk           
-libwebp                             1.3.1-r0                         apk           
+libvorbis                            1.3.7-r1                         apk           
-libx11                              1.8.4-r4                         apk           
+libvpx                               1.13.0-r2                        apk           
-libxau                              1.0.11-r2                        apk           
+libwbclient                          4.18.9-r0                        apk           
-libxcb                              1.15-r1                          apk           
+libwebp                              1.3.2-r0                         apk           
-libxdmcp                            1.1.4-r2                         apk           
+libx11                               1.8.7-r0                         apk           
-libxext                             1.3.5-r2                         apk           
+libxau                               1.0.11-r2                        apk           
-libxfixes                           6.0.1-r2                         apk           
+libxcb                               1.15-r1                          apk           
-libxft                              2.3.8-r1                         apk           
+libxdmcp                             1.1.4-r2                         apk           
-libxml2                             2.11.4-r0                        apk           
+libxext                              1.3.5-r2                         apk           
-libxpm                              3.5.16-r1                        apk           
+libxfixes                            6.0.1-r2                         apk           
-libxrender                          0.9.11-r3                        apk           
+libxft                               2.3.8-r1                         apk           
-libxt                               1.3.0-r2                         apk           
+libxml2                              2.11.6-r0                        apk           
-libxxhash                           0.8.2-r0                         apk           
+libxpm                               3.5.16-r1                        apk           
-libzip                              1.9.2-r2                         apk           
+libxrender                           0.9.11-r3                        apk           
-libzmq                              4.3.4-r4                         apk           
+libxt                                1.3.0-r2                         apk           
-linux-pam                           1.5.2-r10                        apk           
+libxxhash                            0.8.2-r0                         apk           
-lmdb                                0.9.31-r0                        apk           
+libzip                               1.9.2-r2                         apk           
-logrotate                           3.21.0-r1                        apk           
+libzmq                               4.3.4-r4                         apk           
-lz4-libs                            1.9.4-r4                         apk           
+linux-pam                            1.5.2-r10                        apk           
-mbedtls                             2.28.3-r1                        apk           
+lmdb                                 0.9.31-r0                        apk           
-mexitek/phpcolors                   v1.0.4                           php-composer  
+logrotate                            3.21.0-r1                        apk           
-microsoft/azure-storage-blob        1.5.4                            php-composer  
+lz4-libs                             1.9.4-r4                         apk           
-microsoft/azure-storage-common      1.5.2                            php-composer  
+mbedtls                              2.28.5-r0                        apk           
-mlocati/ip-lib                      1.18.0                           php-composer  
+mexitek/phpcolors                    v1.0.4                           php-composer  
-mpg123-libs                         1.31.3-r1                        apk           
+microsoft/azure-storage-blob         1.5.4                            php-composer  
-mtdowling/jmespath.php              2.6.1                            php-composer  
+microsoft/azure-storage-common       1.5.2                            php-composer  
-musl                                1.2.4-r0                         apk           
+mlocati/ip-lib                       1.18.0                           php-composer  
-musl-utils                          1.2.4-r0                         apk           
+mpg123-libs                          1.31.3-r1                        apk           
-nano                                7.2-r1                           apk           
+mtdowling/jmespath.php               2.6.1                            php-composer  
-ncurses-terminfo-base               6.4_p20230506-r0                 apk           
+musl                                 1.2.4-r2                         apk           
-netcat-openbsd                      1.219-r1                         apk           
+musl-utils                           1.2.4-r2                         apk           
-nettle                              3.8.1-r2                         apk           
+nano                                 7.2-r1                           apk           
-nextcloud/lognormalizer             v1.0.0                           php-composer  
+ncurses-terminfo-base                6.4_p20230506-r0                 apk           
-nghttp2-libs                        1.53.0-r0                        apk           
+netcat-openbsd                       1.219-r1                         apk           
-nginx                               1.24.0-r6                        apk           
+nettle                               3.8.1-r2                         apk           
-numactl                             2.0.16-r4                        apk           
+nextcloud                            1.0.0                            npm           
-onevpl-libs                         2023.2.1-r0                      apk           
+nextcloud/lognormalizer              v1.0.0                           php-composer  
-oniguruma                           6.9.8-r1                         apk           
+nghttp2-libs                         1.57.0-r0                        apk           
-openssl                             3.1.1-r3                         apk           
+nginx                                1.24.0-r7                        apk           
-opis/closure                        3.6.3                            php-composer  
+notifications                        2.16.0                           npm           
-opus                                1.4-r0                           apk           
+numactl                              2.0.16-r4                        apk           
-orc                                 0.4.34-r0                        apk           
+onevpl-libs                          2023.2.1-r0                      apk           
-p11-kit                             0.24.1-r2                        apk           
+oniguruma                            6.9.8-r1                         apk           
-pango                               1.50.14-r1                       apk           
+openssl                              3.1.4-r3                         apk           
-pcre                                8.45-r3                          apk           
+opus                                 1.4-r0                           apk           
-pcre2                               10.42-r1                         apk           
+orc                                  0.4.34-r0                        apk           
-pear/archive_tar                    1.4.14                           php-composer  
+p11-kit                              0.24.1-r2                        apk           
-pear/console_getopt                 v1.4.3                           php-composer  
+pango                                1.50.14-r1                       apk           
-pear/pear-core-minimal              v1.10.10                         php-composer  
+password_policy                      1.18.0                           npm           
-pear/pear_exception                 v1.0.2                           php-composer  
+pcre                                 8.45-r3                          apk           
-php-cli                             8.2.8                            binary        
+pcre2                                10.42-r1                         apk           
-php-fpm                             8.2.8                            binary        
+pear/archive_tar                     1.4.14                           php-composer  
-php-http/guzzle7-adapter            1.0.0                            php-composer  
+pear/console_getopt                  v1.4.3                           php-composer  
-php-http/httplug                    2.2.0                            php-composer  
+pear/pear-core-minimal               v1.10.10                         php-composer  
-php-http/promise                    1.1.0                            php-composer  
+pear/pear_exception                  v1.0.2                           php-composer  
-php-opencloud/openstack             v3.2.1                           php-composer  
+photos                               2.4.0                            npm           
-php82                               8.2.8-r0                         apk           
+php-http/guzzle7-adapter             1.0.0                            php-composer  
-php82-bcmath                        8.2.8-r0                         apk           
+php-http/httplug                     2.2.0                            php-composer  
-php82-bz2                           8.2.8-r0                         apk           
+php-http/promise                     1.1.0                            php-composer  
-php82-common                        8.2.8-r0                         apk           
+php-opencloud/openstack              v3.2.1                           php-composer  
-php82-ctype                         8.2.8-r0                         apk           
+php82                                8.2.13-r0                        apk           
-php82-curl                          8.2.8-r0                         apk           
+php82-bcmath                         8.2.13-r0                        apk           
-php82-dom                           8.2.8-r0                         apk           
+php82-bz2                            8.2.13-r0                        apk           
-php82-exif                          8.2.8-r0                         apk           
+php82-common                         8.2.13-r0                        apk           
-php82-fileinfo                      8.2.8-r0                         apk           
+php82-ctype                          8.2.13-r0                        apk           
-php82-fpm                           8.2.8-r0                         apk           
+php82-curl                           8.2.13-r0                        apk           
-php82-ftp                           8.2.8-r0                         apk           
+php82-dom                            8.2.13-r0                        apk           
-php82-gd                            8.2.8-r0                         apk           
+php82-exif                           8.2.13-r0                        apk           
-php82-gmp                           8.2.8-r0                         apk           
+php82-fileinfo                       8.2.13-r0                        apk           
-php82-iconv                         8.2.8-r0                         apk           
+php82-fpm                            8.2.13-r0                        apk           
-php82-imap                          8.2.8-r0                         apk           
+php82-ftp                            8.2.13-r0                        apk           
-php82-intl                          8.2.8-r0                         apk           
+php82-gd                             8.2.13-r0                        apk           
-php82-ldap                          8.2.8-r0                         apk           
+php82-gmp                            8.2.13-r0                        apk           
-php82-mbstring                      8.2.8-r0                         apk           
+php82-iconv                          8.2.13-r0                        apk           
-php82-mysqlnd                       8.2.8-r0                         apk           
+php82-imap                           8.2.13-r0                        apk           
-php82-opcache                       8.2.8-r0                         apk           
+php82-intl                           8.2.13-r0                        apk           
-php82-openssl                       8.2.8-r0                         apk           
+php82-ldap                           8.2.13-r0                        apk           
-php82-pcntl                         8.2.8-r0                         apk           
+php82-mbstring                       8.2.13-r0                        apk           
-php82-pdo                           8.2.8-r0                         apk           
+php82-mysqlnd                        8.2.13-r0                        apk           
-php82-pdo_mysql                     8.2.8-r0                         apk           
+php82-opcache                        8.2.13-r0                        apk           
-php82-pdo_pgsql                     8.2.8-r0                         apk           
+php82-openssl                        8.2.13-r0                        apk           
-php82-pdo_sqlite                    8.2.8-r0                         apk           
+php82-pcntl                          8.2.13-r0                        apk           
-php82-pecl-apcu                     5.1.22-r0                        apk           
+php82-pdo                            8.2.13-r0                        apk           
-php82-pecl-igbinary                 3.2.14-r0                        apk           
+php82-pdo_mysql                      8.2.13-r0                        apk           
-php82-pecl-imagick                  3.7.0-r5                         apk           
+php82-pdo_pgsql                      8.2.13-r0                        apk           
-php82-pecl-mcrypt                   1.0.6-r0                         apk           
+php82-pdo_sqlite                     8.2.13-r0                        apk           
-php82-pecl-memcached                3.2.0-r1                         apk           
+php82-pecl-apcu                      5.1.22-r0                        apk           
-php82-pecl-msgpack                  2.2.0-r0                         apk           
+php82-pecl-igbinary                  3.2.14-r0                        apk           
-php82-pecl-redis                    5.3.7-r2                         apk           
+php82-pecl-imagick                   3.7.0-r5                         apk           
-php82-pecl-smbclient                1.1.1-r0                         apk           
+php82-pecl-memcached                 3.2.0-r1                         apk           
-php82-pgsql                         8.2.8-r0                         apk           
+php82-pecl-msgpack                   2.2.0-r0                         apk           
-php82-phar                          8.2.8-r0                         apk           
+php82-pecl-redis                     6.0.2-r0                         apk           
-php82-posix                         8.2.8-r0                         apk           
+php82-pecl-smbclient                 1.1.1-r0                         apk           
-php82-session                       8.2.8-r0                         apk           
+php82-pgsql                          8.2.13-r0                        apk           
-php82-simplexml                     8.2.8-r0                         apk           
+php82-phar                           8.2.13-r0                        apk           
-php82-sockets                       8.2.8-r0                         apk           
+php82-posix                          8.2.13-r0                        apk           
-php82-sodium                        8.2.8-r0                         apk           
+php82-session                        8.2.13-r0                        apk           
-php82-sqlite3                       8.2.8-r0                         apk           
+php82-simplexml                      8.2.13-r0                        apk           
-php82-sysvsem                       8.2.8-r0                         apk           
+php82-sockets                        8.2.13-r0                        apk           
-php82-xml                           8.2.8-r0                         apk           
+php82-sodium                         8.2.13-r0                        apk           
-php82-xmlreader                     8.2.8-r0                         apk           
+php82-sqlite3                        8.2.13-r0                        apk           
-php82-xmlwriter                     8.2.8-r0                         apk           
+php82-sysvsem                        8.2.13-r0                        apk           
-php82-zip                           8.2.8-r0                         apk           
+php82-xml                            8.2.13-r0                        apk           
-phpseclib/phpseclib                 2.0.40                           php-composer  
+php82-xmlreader                      8.2.13-r0                        apk           
-pimple/pimple                       v3.5.0                           php-composer  
+php82-xmlwriter                      8.2.13-r0                        apk           
-pixman                              0.42.2-r1                        apk           
+php82-zip                            8.2.13-r0                        apk           
-pkgconf                             1.9.5-r0                         apk           
+phpseclib/phpseclib                  2.0.45                           php-composer  
-popt                                1.19-r2                          apk           
+pimple/pimple                        v3.5.0                           php-composer  
-procps-ng                           4.0.3-r1                         apk           
+pixman                               0.42.2-r1                        apk           
-psr/cache                           1.0.1                            php-composer  
+pkgconf                              1.9.5-r0                         apk           
-psr/clock                           1.0.0                            php-composer  
+popt                                 1.19-r2                          apk           
-psr/container                       2.0.2                            php-composer  
+privacy                              1.12.0                           npm           
-psr/event-dispatcher                1.0.0                            php-composer  
+procps-ng                            4.0.4-r0                         apk           
-psr/http-client                     1.0.1                            php-composer  
+psr/cache                            3.0.0                            php-composer  
-psr/http-factory                    1.0.1                            php-composer  
+psr/clock                            1.0.0                            php-composer  
-psr/http-message                    1.0.1                            php-composer  
+psr/container                        2.0.2                            php-composer  
-psr/log                             1.1.4                            php-composer  
+psr/event-dispatcher                 1.0.0                            php-composer  
-punic/punic                         1.6.5                            php-composer  
+psr/http-client                      1.0.1                            php-composer  
-ralouphie/getallheaders             3.0.3                            php-composer  
+psr/http-factory                     1.0.1                            php-composer  
-ramsey/collection                   1.1.3                            php-composer  
+psr/http-message                     1.0.1                            php-composer  
-ramsey/uuid                         4.1.1                            php-composer  
+psr/log                              1.1.4                            php-composer  
-readline                            8.2.1-r1                         apk           
+punic/punic                          3.8.1                            php-composer  
-rsync                               3.2.7-r4                         apk           
+ralouphie/getallheaders              3.0.3                            php-composer  
-rubix/ml                            dev-chore/bump-flysystem-v2.1.1  php-composer  
+ramsey/collection                    1.1.3                            php-composer  
-rubix/tensor                        2.2.3                            php-composer  
+ramsey/uuid                          4.1.1                            php-composer  
-rullzer/easytotp                    v0.1.4                           php-composer  
+readline                             8.2.1-r1                         apk           
-sabre/dav                           4.4.0                            php-composer  
+recommendations                      2.0.0                            npm           
-sabre/event                         5.1.4                            php-composer  
+related_resources                    1.3.0                            npm           
-sabre/http                          5.1.5                            php-composer  
+rsync                                3.2.7-r4                         apk           
-sabre/uri                           2.2.2                            php-composer  
+rubix/ml                             dev-chore/bump-flysystem-v2.1.1  php-composer  
-sabre/vobject                       4.4.2                            php-composer  
+rubix/tensor                         2.2.3                            php-composer  
-sabre/xml                           2.2.5                            php-composer  
+rullzer/easytotp                     v0.1.4                           php-composer  
-samba-client                        4.18.5-r0                        apk           
+sabre/dav                            4.5.0                            php-composer  
-samba-client-libs                   4.18.5-r0                        apk           
+sabre/event                          5.1.4                            php-composer  
-samba-common                        4.18.5-r0                        apk           
+sabre/http                           5.1.10                           php-composer  
-samba-libs                          4.18.5-r0                        apk           
+sabre/uri                            2.3.3                            php-composer  
-samba-util-libs                     4.18.5-r0                        apk           
+sabre/vobject                        4.5.4                            php-composer  
-scanelf                             1.3.7-r1                         apk           
+sabre/xml                            2.2.6                            php-composer  
-scssphp/scssphp                     v1.11.0                          php-composer  
+samba-client                         4.18.9-r0                        apk           
-sdl2                                2.26.5-r0                        apk           
+samba-client-libs                    4.18.9-r0                        apk           
-shaderc                             2023.3-r1                        apk           
+samba-common                         4.18.9-r0                        apk           
-shadow                              4.13-r4                          apk           
+samba-libs                           4.18.9-r0                        apk           
-shared-mime-info                    2.2-r5                           apk           
+samba-util-libs                      4.18.9-r0                        apk           
-skalibs                             2.13.1.1-r1                      apk           
+scanelf                              1.3.7-r1                         apk           
-soxr                                0.1.3-r5                         apk           
+scssphp/scssphp                      v1.11.0                          php-composer  
-speexdsp                            1.2.1-r1                         apk           
+sdl2                                 2.26.5-r0                        apk           
-spirv-tools                         1.3.243.0-r1                     apk           
+shaderc                              2023.3-r1                        apk           
-spomky-labs/base64url               v2.0.4                           php-composer  
+shadow                               4.13-r4                          apk           
-spomky-labs/cbor-php                v2.0.1                           php-composer  
+shared-mime-info                     2.2-r5                           apk           
-sqlite-libs                         3.41.2-r2                        apk           
+skalibs                              2.13.1.1-r1                      apk           
-ssl_client                          1.36.1-r1                        apk           
+soxr                                 0.1.3-r5                         apk           
-stecman/symfony-console-completion  0.11.0                           php-composer  
+speexdsp                             1.2.1-r1                         apk           
-sudo                                1.9.13_p3-r2                     apk           
+spirv-tools                          1.3.243.0-r1                     apk           
-svt-av1-libs                        1.6.0-r0                         apk           
+spomky-labs/base64url                v2.0.4                           php-composer  
-swiftmailer/swiftmailer             v6.3.0                           php-composer  
+spomky-labs/cbor-php                 v2.0.1                           php-composer  
-symfony/console                     v5.4.19                          php-composer  
+sqlite-libs                          3.41.2-r3                        apk           
-symfony/css-selector                v5.4.11                          php-composer  
+ssl_client                           1.36.1-r5                        apk           
-symfony/deprecation-contracts       v2.5.2                           php-composer  
+stecman/symfony-console-completion   0.11.0                           php-composer  
-symfony/dom-crawler                 v5.4.11                          php-composer  
+sudo                                 1.9.13_p3-r2                     apk           
-symfony/event-dispatcher            v4.4.30                          php-composer  
+suspicious_login                     6.0.0                            npm           
-symfony/event-dispatcher-contracts  v1.1.9                           php-composer  
+svt-av1-libs                         1.6.0-r0                         apk           
-symfony/http-foundation             v5.4.10                          php-composer  
+symfony/console                      v5.4.24                          php-composer  
-symfony/mailer                      v5.4.19                          php-composer  
+symfony/css-selector                 v5.4.11                          php-composer  
-symfony/mime                        v5.4.19                          php-composer  
+symfony/deprecation-contracts        v3.0.2                           php-composer  
-symfony/polyfill-ctype              v1.23.0                          php-composer  
+symfony/dom-crawler                  v5.4.11                          php-composer  
-symfony/polyfill-iconv              v1.27.0                          php-composer  
+symfony/event-dispatcher             v5.4.26                          php-composer  
-symfony/polyfill-intl-grapheme      v1.23.1                          php-composer  
+symfony/event-dispatcher-contracts   v3.0.2                           php-composer  
-symfony/polyfill-intl-idn           v1.27.0                          php-composer  
+symfony/http-foundation              v5.4.25                          php-composer  
-symfony/polyfill-intl-normalizer    v1.27.0                          php-composer  
+symfony/mailer                       v5.4.22                          php-composer  
-symfony/polyfill-mbstring           v1.27.0                          php-composer  
+symfony/mime                         v5.4.19                          php-composer  
-symfony/polyfill-php72              v1.27.0                          php-composer  
+symfony/polyfill-ctype               v1.23.0                          php-composer  
-symfony/polyfill-php73              v1.23.0                          php-composer  
+symfony/polyfill-intl-grapheme       v1.23.1                          php-composer  
-symfony/polyfill-php73              v1.26.0                          php-composer  
+symfony/polyfill-intl-idn            v1.27.0                          php-composer  
-symfony/polyfill-php80              v1.26.0                          php-composer  
+symfony/polyfill-intl-normalizer     v1.27.0                          php-composer  
-symfony/polyfill-php80              v1.27.0                          php-composer  
+symfony/polyfill-mbstring            v1.27.0                          php-composer  
-symfony/process                     v4.4.30                          php-composer  
+symfony/polyfill-php72               v1.27.0                          php-composer  
-symfony/routing                     v4.4.30                          php-composer  
+symfony/polyfill-php73               v1.23.0                          php-composer  
-symfony/service-contracts           v3.0.2                           php-composer  
+symfony/polyfill-php73               v1.26.0                          php-composer  
-symfony/string                      v6.0.19                          php-composer  
+symfony/polyfill-php80               v1.27.0                          php-composer  
-symfony/translation                 v4.4.41                          php-composer  
+symfony/process                      v5.4.24                          php-composer  
-symfony/translation-contracts       v2.4.0                           php-composer  
+symfony/routing                      v5.4.25                          php-composer  
-talloc                              2.4.0-r1                         apk           
+symfony/service-contracts            v3.0.2                           php-composer  
-tdb-libs                            1.4.8-r1                         apk           
+symfony/string                       v6.0.19                          php-composer  
-tevent                              0.14.1-r1                        apk           
+symfony/translation                  v5.4.24                          php-composer  
-thecodingmachine/safe               v1.3.3                           php-composer  
+symfony/translation-contracts        v2.4.0                           php-composer  
-tiff                                4.5.1-r0                         apk           
+talloc                               2.4.0-r1                         apk           
-tzdata                              2023c-r1                         apk           
+tdb-libs                             1.4.8-r1                         apk           
-utmps-libs                          0.1.2.1-r1                       apk           
+tevent                               0.14.1-r1                        apk           
-v4l-utils-libs                      1.24.1-r0                        apk           
+thecodingmachine/safe                v1.3.3                           php-composer  
-vidstab                             1.1.1-r0                         apk           
+tiff                                 4.5.1-r0                         apk           
-vulkan-loader                       1.3.243.0-r1                     apk           
+twofactor_totp                       10.0.0-beta2                     npm           
-wayland-libs-client                 1.22.0-r2                        apk           
+tzdata                               2023d-r0                         apk           
-web-auth/cose-lib                   v3.3.9                           php-composer  
+utmps-libs                           0.1.2.1-r1                       apk           
-web-auth/metadata-service           v3.3.9                           php-composer  
+v4l-utils-libs                       1.24.1-r0                        apk           
-web-auth/webauthn-lib               v3.3.9                           php-composer  
+vidstab                              1.1.1-r0                         apk           
-x264-libs                           0.164_git20220602-r1             apk           
+viewer                               2.2.0                            npm           
-x265-libs                           3.5-r4                           apk           
+vulkan-loader                        1.3.243.0-r1                     apk           
-xvidcore                            1.3.7-r1                         apk           
+wapmorgan/mp3info                    0.1.0                            php-composer  
-xz-libs                             5.4.3-r0                         apk           
+wayland-libs-client                  1.22.0-r2                        apk           
-zimg                                3.0.5-r0                         apk           
+web-auth/cose-lib                    v3.3.9                           php-composer  
-zlib                                1.2.13-r1                        apk           
+web-auth/metadata-service            v3.3.9                           php-composer  
-zstd-libs                           1.5.5-r4                         apk           
+web-auth/webauthn-lib                v3.3.9                           php-composer  
 x264-libs                            0.164_git20220602-r1             apk           
 x265-libs                            3.5-r4                           apk           
 xvidcore                             1.3.7-r1                         apk           
 xz-libs                              5.4.3-r0                         apk           
 zimg                                 3.0.5-r0                         apk           
 zlib                                 1.2.13-r1                        apk           
 zstd-libs                            1.5.5-r4                         apk           
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -17,9 +17,10 @@ available_architectures:
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-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
@ -78,6 +79,11 @@ app_setup_block: |
 # changelog
 changelogs:
  - { 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." }
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@ -1,4 +1,4 @@
-## Version 2023/06/23 - 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 {
@ -36,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 Referrer-Policy                   "no-referrer"       always;
-    add_header X-Content-Type-Options               "nosniff"           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-Frame-Options                      "SAMEORIGIN"        always;
+    add_header X-Permitted-Cross-Domain-Policies "none"              always;
-    add_header X-Permitted-Cross-Domain-Policies    "none"              always;
+    add_header X-Robots-Tag                      "noindex, nofollow" always;
-    add_header X-Robots-Tag                         "noindex, nofollow" always;
+    add_header X-XSS-Protection                  "1; mode=block"     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;
@ -66,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;
@ -113,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;
@ -134,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
@ -142,6 +142,7 @@ server {
        location ~ \.wasm$ {
            default_type application/wasm;
        }
    }
    location ~ \.woff2?$ {
--- a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
@ -90,7 +90,7 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal
    echo "Setting permissions"
    lsiown abc:abc /data
-    lsiown abc:abc -R \
+    lsiown -R abc:abc \
        /app/www/public \
        /config/www/nextcloud
@ -124,7 +124,7 @@ if occ config:system:get installed >/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
+        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'
@ -132,6 +132,9 @@ if occ config:system:get installed >/dev/null 2>&1; then
    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:"
@ -139,11 +142,25 @@ else
    echo "https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/files_locking_transactional.html"
 fi
-if (occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
+# remove problematic apps
-    echo "Removing CODE Server"
+for APP in richdocumentscode; do
-    APP=$(occ app:list --no-interaction | grep richdocumentscode | awk -F ' ' '{print $2}' | tr -d ':')
+    if (occ app:list | grep -q " - ${APP}:") 2>/dev/null; then
-    occ app:remove --no-interaction "${APP}" 2>/dev/null
+        echo "Removing ${APP}"
-fi
+    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
@ -151,3 +168,9 @@ if [ ! -s /config/www/nextcloud/config/config.php ]; then
 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
--- a/root/migrations/02-default-location
+++ b/root/migrations/02-default-location
@ -5,7 +5,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /config/www/nextcloud/;"
 NEW_ROOT="root /app/www/public;"
-if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}"; then
+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
Author	SHA1	Message	Date
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
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