Bot Updating Package Versions

2026-06-03 09:57:35 +00:00 · 2024-06-17 21:34:18 +00:00 · 2024-06-11 11:50:49 +00:00 · 2024-06-04 11:50:59 +00:00 · 2024-05-28 11:52:42 +00:00 · 2024-05-21 11:51:56 +00:00
13 changed files with 170 additions and 290 deletions
@@ -24,7 +24,7 @@
 ## Readme

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

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

 ## Update the changelog

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

 ```yml
 changelogs:
@@ -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

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

@@ -4,26 +4,26 @@ on:
  workflow_dispatch:

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

      - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_NEXTCLOUD_MASTER\". ****"
-          echo "External trigger running off of 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\". ****"
+          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 }}
@@ -9,5 +9,5 @@ jobs:
    - uses: actions/first-interaction@v1
      with:
        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-nextcloud/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -4,28 +4,28 @@ on:
  workflow_dispatch:

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

      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/develop'
        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nextcloud/job/develop/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_NEXTCLOUD_MASTER\". ****"
-          echo "Package trigger running off of 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\". ****"
+          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 ****"
@@ -18,9 +18,6 @@ RUN \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
-    imagemagick-heic \
-    imagemagick-pdf \
-    imagemagick-svg \
    libxml2 \
    php83-apcu \
    php83-bcmath \
@@ -85,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 && \
@@ -18,9 +18,6 @@ RUN \
    ffmpeg \
    gnu-libiconv \
    imagemagick \
-    imagemagick-heic \
-    imagemagick-pdf \
-    imagemagick-svg \
    libxml2 \
    php83-apcu \
    php83-bcmath \
@@ -85,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 && \
@@ -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' ''',
@@ -77,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
@@ -115,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'
        }
@@ -155,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 {
@@ -168,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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "develop"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -191,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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -214,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.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
        }
@@ -257,7 +257,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -269,24 +269,24 @@ pipeline {
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
              # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch develop of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch develop of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch develop --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
              echo "Starting Stage 1 - Jenkinsfile update"
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -295,7 +295,7 @@ pipeline {
                echo "Jenkinsfile is up to date."
              fi
              echo "Starting Stage 2 - Delete old templates"
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              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"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -305,13 +305,13 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                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/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -327,7 +327,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f develop
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -340,8 +340,8 @@ pipeline {
                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 master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git develop
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
@@ -381,7 +381,9 @@ pipeline {
                echo "Updating Unraid template"
                cd ${TEMPDIR}/unraid/templates/
                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif 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
@@ -440,7 +442,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -453,10 +455,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: ''
      }
@@ -523,6 +525,7 @@ pipeline {
          --label \"org.opencontainers.image.title=Nextcloud\" \
          --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=false --sbom=false \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
@@ -554,6 +557,7 @@ pipeline {
              --label \"org.opencontainers.image.title=Nextcloud\" \
              --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@@ -582,6 +586,7 @@ pipeline {
              --label \"org.opencontainers.image.title=Nextcloud\" \
              --label \"org.opencontainers.image.description=[Nextcloud](https://nextcloud.com/) gives you access to all your files wherever you are.    Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home.  \" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            retry(5) {
@@ -600,7 +605,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: ''
      }
@@ -623,14 +628,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 pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                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
@@ -648,7 +653,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: ''
@@ -662,7 +667,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: ''
@@ -705,7 +710,7 @@ pipeline {
                --shm-size=1gb \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                -e TAGS=\"${CI_TAGS}\" \
                -e META_TAG=\"${META_TAG}\" \
                -e PORT=\"${CI_PORT}\" \
@@ -749,12 +754,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
@@ -794,10 +799,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}
@@ -805,43 +810,21 @@ 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 create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --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
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                  done
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
                  done
               '''
@@ -852,7 +835,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
        }
@@ -864,17 +847,17 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 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'''
      }
@@ -882,14 +865,14 @@ pipeline {
    // Add protection to the release branch
    stage('Github-Release-Branch-Protection') {
      when {
-        branch "master"
+        branch "develop"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        echo "Setting up protection for release branch master"
+        echo "Setting up protection for release branch develop"
        sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/develop/protection \
          -d $(jq -c .  << EOF
            {
              "required_status_checks": null,
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read 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!")
@@ -28,7 +28,7 @@ Find us at:

 # [linuxserver/nextcloud](https://github.com/linuxserver/docker-nextcloud)

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnextcloud?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fnextcloud)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fnextcloud?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nextcloud)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nextcloud.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-nextcloud/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-nextcloud/packages)
@@ -36,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.
@@ -49,7 +49,7 @@ Where are your photos and documents? With Nextcloud you pick a server of your ch

 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://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:

@@ -72,8 +72,6 @@ This image provides various versions that are available via tags. Please read th

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

-Note: `occ` should be run without prepending with `sudo -u abc php` or `sudo -u www-data php` ie; `docker exec -it nextcloud occ maintenance:mode --off`
-
 ### Updating Nextcloud

 Updating Nextcloud is done by pulling the new image, and recreating the container with it.
@@ -88,34 +86,6 @@ Nextcloud's built-in collaborative editing packages (Collabora/CODE and OnlyOffi

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

-### HEIC Image Previews
-
-In order to enable HEIC image preview generation you will need to add the following to your `config.php` file in your `config/www/nextcloud/config' directory;
-
-```
-  'enable_previews' => true,
-  'enabledPreviewProviders' =>
-  array (
-    'OC\Preview\PNG',
-    'OC\Preview\JPEG',
-    'OC\Preview\GIF',
-    'OC\Preview\BMP',
-    'OC\Preview\XBitmap',
-    'OC\Preview\MP3',
-    'OC\Preview\TXT',
-    'OC\Preview\MarkDown',
-    'OC\Preview\OpenDocument',
-    'OC\Preview\Krita',
-    'OC\Preview\HEIC',
-  ),
-```
-
-You may need to log out and back in for the changes to come in to effect. 
-
-This fix was sourced from [Nextcloud Documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#enabledpreviewproviders)
-
-Nextcloud state that HEIC preview is disabled by default due to performance or privacy concerns, so enable this at your own risk. 
-
 ### Custom App Directories

 If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
@@ -142,7 +112,7 @@ To help you get started creating a container from this image you can either use
 ---
 services:
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: lscr.io/linuxserver/nextcloud:develop
    container_name: nextcloud
    environment:
      - PUID=1000
@@ -168,7 +138,7 @@ docker run -d \
  -v /path/to/nextcloud/config:/config \
  -v /path/to/data:/data \
  --restart unless-stopped \
-  lscr.io/linuxserver/nextcloud:latest
+  lscr.io/linuxserver/nextcloud:develop
 ```

 ## Parameters
@@ -248,7 +218,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:

    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/nextcloud:develop
    ```

 ## Updating Info
@@ -296,7 +266,7 @@ Below are the instructions for updating containers:
 * Update the image:

    ```bash
-    docker pull lscr.io/linuxserver/nextcloud:latest
+    docker pull lscr.io/linuxserver/nextcloud:develop
    ```

 * Stop the running container:
@@ -332,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`
@@ -345,10 +315,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

-* **10.04.24:** - Added imagemagick-pdf.
-* **05.04.24:** - Added imagemagick-heic. Manual update to `config.php` required - see above.
-* **02.04.24:** - Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push).
-* **22.03.24:** - Add imagemagick-svg module.
 * **06.03.24:** - Rebase to Alpine 3.19 with php 8.3.
 * **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
 * **22.12.23:** - Site default conf updating to include mime.types for js and mjs and update location to include more file types.
@@ -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"
-release_type: stable
-release_tag: latest
-ls_branch: master
+custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/server/releases | jq -r '.[] | select(.prerelease == true) | .tag_name' | sed 's|^v||g' | sort -rV | head -1"
+release_type: prerelease
+release_tag: develop
+ls_branch: develop
 build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE'
@@ -26,7 +26,6 @@ argon2-libs                          20190702-r5                      apk
 arrayvec                             0.7.2                            rust-crate                    
 av-metrics                           0.9.0                            rust-crate                    
 av1-grain                            0.2.2                            rust-crate                    
-avahi-libs                           0.8-r16                          apk                           
 aws/aws-crt-php                      v1.0.2                           php-composer                  
 aws/aws-sdk-php                      3.240.8                          php-composer                  
 bamarni/composer-bin-plugin          1.8.2                            php-composer                  
@@ -41,14 +40,13 @@ bitvec_helpers                       3.1.2                            rust-crate
 brick/math                           0.9.2                            php-composer                  
 brotli-libs                          1.1.0-r1                         apk                           
 bruteforcesettings                   2.9.0                            npm                           
-busybox                              1.36.1-r15                       apk                           
-busybox-binsh                        1.36.1-r15                       apk                           
+busybox                              1.36.1-r18                       apk                           
+busybox-binsh                        1.36.1-r18                       apk                           
 c-ares                               1.27.0-r0                        apk                           
 c-client                             2007f-r15                        apk                           
 ca-certificates                      20240226-r0                      apk                           
 ca-certificates-bundle               20240226-r0                      apk                           
-cairo                                1.18.0-r0                        apk                           
-cairo-gobject                        1.18.0-r0                        apk                           
+catatonit                            0.2.0-r0                         apk                           
 cfg-if                               1.0.0                            rust-crate                    
 christian-riesen/base32              1.6.0                            php-composer                  
 cjson                                1.7.17-r0                        apk                           
@@ -56,7 +54,7 @@ clap                                 4.0.32                           rust-crate
 clap_complete                        4.0.7                            rust-crate                    
 clap_derive                          4.0.21                           rust-crate                    
 clap_lex                             0.3.0                            rust-crate                    
-composer                             2.7.4                            binary                        
+composer                             2.7.7                            binary                        
 console                              0.15.5                           rust-crate                    
 coreutils                            9.4-r2                           apk                           
 coreutils-env                        9.4-r2                           apk                           
@@ -70,7 +68,6 @@ crossbeam-deque                      0.8.3                            rust-crate
 crossbeam-epoch                      0.9.14                           rust-crate                    
 crossbeam-queue                      0.3.8                            rust-crate                    
 crossbeam-utils                      0.8.15                           rust-crate                    
-cups-libs                            2.4.7-r0                         apk                           
 curl                                 8.5.0-r0                         apk                           
 cweagans/composer-patches            1.7.3                            php-composer                  
 dbus-libs                            1.14.10-r0                       apk                           
@@ -107,12 +104,10 @@ funty                                2.0.0                            rust-crate
 fusonic/linq                         v1.1.0                           php-composer                  
 fusonic/opengraph                    v2.2.0                           php-composer                  
 gdbm                                 1.23-r1                          apk                           
-gdk-pixbuf                           2.42.10-r6                       apk                           
 getrandom                            0.2.9                            rust-crate                    
-ghostscript                          10.02.1-r0                       apk                           
 giggsey/libphonenumber-for-php-lite  8.13.27                          php-composer                  
-git                                  2.43.0-r0                        apk                           
-glib                                 2.78.4-r0                        apk                           
+git                                  2.43.4-r0                        apk                           
+glib                                 2.78.6-r0                        apk                           
 glslang-libs                         1.3.261.1-r0                     apk                           
 gmp                                  6.3.0-r0                         apk                           
 gnu-libiconv                         1.17-r2                          apk                           
@@ -132,23 +127,17 @@ icewind/smb                          v3.5.4                           php-compos
 icewind/streams                      v0.7.7                           php-composer  (+1 duplicate)  
 icu-data-en                          74.1-r0                          apk                           
 icu-libs                             74.1-r0                          apk                           
-imagemagick                          7.1.1.26-r0                      apk                           
-imagemagick-heic                     7.1.1.26-r0                      apk                           
-imagemagick-jpeg                     7.1.1.26-r0                      apk                           
-imagemagick-jxl                      7.1.1.26-r0                      apk                           
-imagemagick-libs                     7.1.1.26-r0                      apk                           
-imagemagick-pango                    7.1.1.26-r0                      apk                           
-imagemagick-pdf                      7.1.1.26-r0                      apk                           
-imagemagick-svg                      7.1.1.26-r0                      apk                           
-imagemagick-tiff                     7.1.1.26-r0                      apk                           
-imagemagick-webp                     7.1.1.26-r0                      apk                           
+imagemagick                          7.1.1.32-r0                      apk                           
+imagemagick-jpeg                     7.1.1.32-r0                      apk                           
+imagemagick-jxl                      7.1.1.32-r0                      apk                           
+imagemagick-libs                     7.1.1.32-r0                      apk                           
+imagemagick-webp                     7.1.1.32-r0                      apk                           
 interpolate_name                     0.2.3                            rust-crate                    
 io-lifetimes                         1.0.10                           rust-crate                    
 is-terminal                          0.4.7                            rust-crate                    
 itertools                            0.10.5                           rust-crate                    
 ivf                                  0.1.2                            rust-crate                    
 jansson                              2.14-r4                          apk                           
-jbig2dec                             0.20-r0                          apk                           
 jq                                   1.7.1-r0                         apk                           
 justinrainbow/json-schema            v5.2.13                          php-composer                  
 kornrunner/blurhash                  v1.2.2                           php-composer                  
@@ -164,7 +153,7 @@ league/uri                           6.4.0                            php-compos
 league/uri-interfaces                2.2.0                            php-composer                  
 libSvtAv1Enc                         1.7.0-r0                         apk                           
 libacl                               2.3.1-r4                         apk                           
-libarchive                           3.7.2-r1                         apk                           
+libarchive                           3.7.4-r0                         apk                           
 libass                               0.17.1-r1                        apk                           
 libasyncns                           0.8-r2                           apk                           
 libattr                              2.5.1-r5                         apk                           
@@ -177,10 +166,9 @@ libc                                 0.2.144                          rust-crate
 libc                                 0.2.149                          rust-crate                    
 libc-utils                           0.7.2-r5                         apk                           
 libcap2                              2.69-r1                          apk                           
-libcrypto3                           3.1.4-r6                         apk                           
+libcrypto3                           3.1.5-r0                         apk                           
 libcurl                              8.5.0-r0                         apk                           
 libdav1d                             1.3.0-r1                         apk                           
-libde265                             1.0.15-r0                        apk                           
 libdovi                              3.2.0-r1                         apk                           
 libdrm                               2.4.118-r0                       apk                           
 libedit                              20230828.3.1-r3                  apk                           
@@ -191,7 +179,6 @@ libflac                              1.4.3-r1                         apk
 libformw                             6.4_p20231125-r0                 apk                           
 libgcc                               13.2.1_git20231014-r0            apk                           
 libgomp                              13.2.1_git20231014-r0            apk                           
-libheif                              1.17.6-r0                        apk                           
 libhwy                               1.0.7-r0                         apk                           
 libice                               1.1.1-r5                         apk                           
 libidn2                              2.3.4-r4                         apk                           
@@ -211,11 +198,10 @@ libpanelw                            6.4_p20231125-r0                 apk
 libpciaccess                         0.17-r2                          apk                           
 libplacebo                           6.338.1-r0                       apk                           
 libpng                               1.6.40-r0                        apk                           
-libpq                                16.2-r1                          apk                           
+libpq                                16.3-r0                          apk                           
 libproc2                             4.0.4-r0                         apk                           
 libpulse                             16.1-r11                         apk                           
 librist                              0.2.10-r0                        apk                           
-librsvg                              2.57.1-r0                        apk                           
 libsasl                              2.1.28-r5                        apk                           
 libsharpyuv                          1.3.2-r0                         apk                           
 libsm                                1.2.4-r3                         apk                           
@@ -224,7 +210,7 @@ libsndfile                           1.2.2-r0                         apk
 libsodium                            1.0.19-r0                        apk                           
 libsrt                               1.5.3-r0                         apk                           
 libssh                               0.10.6-r0                        apk                           
-libssl3                              3.1.4-r6                         apk                           
+libssl3                              3.1.5-r0                         apk                           
 libstdc++                            13.2.1_git20231014-r0            apk                           
 libtasn1                             4.19.0-r2                        apk                           
 libtheora                            1.1.1-r18                        apk                           
@@ -245,10 +231,8 @@ libxcb                               1.16-r0                          apk
 libxdmcp                             1.1.4-r3                         apk                           
 libxext                              1.3.5-r3                         apk                           
 libxfixes                            6.0.1-r3                         apk                           
-libxft                               2.3.8-r2                         apk                           
-libxml2                              2.11.7-r0                        apk                           
+libxml2                              2.11.8-r0                        apk                           
 libxpm                               3.5.17-r0                        apk                           
-libxrender                           0.9.11-r4                        apk                           
 libxt                                1.3.0-r4                         apk                           
 libxxhash                            0.8.2-r2                         apk                           
 libzip                               1.10.1-r0                        apk                           
@@ -296,12 +280,11 @@ numactl                              2.0.16-r4                        apk
 once_cell                            1.17.1                           rust-crate                    
 onevpl-libs                          2023.3.1-r2                      apk                           
 oniguruma                            6.9.9-r0                         apk                           
-openssl                              3.1.4-r6                         apk                           
+openssl                              3.1.5-r0                         apk                           
 opus                                 1.4-r0                           apk                           
 orc                                  0.4.34-r0                        apk                           
 os_str_bytes                         6.5.0                            rust-crate                    
 p11-kit                              0.25.3-r0                        apk                           
-pango                                1.51.0-r0                        apk                           
 password_policy                      1.19.0                           npm                           
 paste                                1.0.12                           rust-crate                    
 pcre                                 8.45-r3                          apk                           
@@ -315,57 +298,55 @@ php-http/guzzle7-adapter             1.0.0                            php-compos
 php-http/httplug                     2.2.0                            php-composer                  
 php-http/promise                     1.1.0                            php-composer                  
 php-opencloud/openstack              v3.2.1                           php-composer                  
-php83                                8.3.6-r0                         apk                           
-php83-bcmath                         8.3.6-r0                         apk                           
-php83-bz2                            8.3.6-r0                         apk                           
-php83-common                         8.3.6-r0                         apk                           
-php83-ctype                          8.3.6-r0                         apk                           
-php83-curl                           8.3.6-r0                         apk                           
-php83-dom                            8.3.6-r0                         apk                           
-php83-exif                           8.3.6-r0                         apk                           
-php83-fileinfo                       8.3.6-r0                         apk                           
-php83-fpm                            8.3.6-r0                         apk                           
-php83-ftp                            8.3.6-r0                         apk                           
-php83-gd                             8.3.6-r0                         apk                           
-php83-gmp                            8.3.6-r0                         apk                           
-php83-iconv                          8.3.6-r0                         apk                           
-php83-imap                           8.3.6-r0                         apk                           
-php83-intl                           8.3.6-r0                         apk                           
-php83-ldap                           8.3.6-r0                         apk                           
-php83-mbstring                       8.3.6-r0                         apk                           
-php83-mysqlnd                        8.3.6-r0                         apk                           
-php83-opcache                        8.3.6-r0                         apk                           
-php83-openssl                        8.3.6-r0                         apk                           
-php83-pcntl                          8.3.6-r0                         apk                           
-php83-pdo                            8.3.6-r0                         apk                           
-php83-pdo_mysql                      8.3.6-r0                         apk                           
-php83-pdo_pgsql                      8.3.6-r0                         apk                           
-php83-pdo_sqlite                     8.3.6-r0                         apk                           
+php83                                8.3.8-r0                         apk                           
+php83-bcmath                         8.3.8-r0                         apk                           
+php83-bz2                            8.3.8-r0                         apk                           
+php83-common                         8.3.8-r0                         apk                           
+php83-ctype                          8.3.8-r0                         apk                           
+php83-curl                           8.3.8-r0                         apk                           
+php83-dom                            8.3.8-r0                         apk                           
+php83-exif                           8.3.8-r0                         apk                           
+php83-fileinfo                       8.3.8-r0                         apk                           
+php83-fpm                            8.3.8-r0                         apk                           
+php83-ftp                            8.3.8-r0                         apk                           
+php83-gd                             8.3.8-r0                         apk                           
+php83-gmp                            8.3.8-r0                         apk                           
+php83-iconv                          8.3.8-r0                         apk                           
+php83-imap                           8.3.8-r0                         apk                           
+php83-intl                           8.3.8-r0                         apk                           
+php83-ldap                           8.3.8-r0                         apk                           
+php83-mbstring                       8.3.8-r0                         apk                           
+php83-mysqlnd                        8.3.8-r0                         apk                           
+php83-opcache                        8.3.8-r0                         apk                           
+php83-openssl                        8.3.8-r0                         apk                           
+php83-pcntl                          8.3.8-r0                         apk                           
+php83-pdo                            8.3.8-r0                         apk                           
+php83-pdo_mysql                      8.3.8-r0                         apk                           
+php83-pdo_pgsql                      8.3.8-r0                         apk                           
+php83-pdo_sqlite                     8.3.8-r0                         apk                           
 php83-pecl-apcu                      5.1.23-r0                        apk                           
 php83-pecl-igbinary                  3.2.15-r0                        apk                           
 php83-pecl-imagick                   3.7.0-r0                         apk                           
 php83-pecl-mcrypt                    1.0.7-r0                         apk                           
 php83-pecl-memcached                 3.2.0-r0                         apk                           
-php83-pecl-msgpack                   2.2.0-r1                         apk                           
+php83-pecl-msgpack                   2.2.0-r2                         apk                           
 php83-pecl-redis                     6.0.2-r0                         apk                           
 php83-pecl-smbclient                 1.1.1-r0                         apk                           
-php83-pgsql                          8.3.6-r0                         apk                           
-php83-phar                           8.3.6-r0                         apk                           
-php83-posix                          8.3.6-r0                         apk                           
-php83-session                        8.3.6-r0                         apk                           
-php83-simplexml                      8.3.6-r0                         apk                           
-php83-sockets                        8.3.6-r0                         apk                           
-php83-sodium                         8.3.6-r0                         apk                           
-php83-sqlite3                        8.3.6-r0                         apk                           
-php83-sysvsem                        8.3.6-r0                         apk                           
-php83-xml                            8.3.6-r0                         apk                           
-php83-xmlreader                      8.3.6-r0                         apk                           
-php83-xmlwriter                      8.3.6-r0                         apk                           
-php83-zip                            8.3.6-r0                         apk                           
+php83-pgsql                          8.3.8-r0                         apk                           
+php83-phar                           8.3.8-r0                         apk                           
+php83-posix                          8.3.8-r0                         apk                           
+php83-session                        8.3.8-r0                         apk                           
+php83-simplexml                      8.3.8-r0                         apk                           
+php83-sockets                        8.3.8-r0                         apk                           
+php83-sodium                         8.3.8-r0                         apk                           
+php83-sqlite3                        8.3.8-r0                         apk                           
+php83-sysvsem                        8.3.8-r0                         apk                           
+php83-xml                            8.3.8-r0                         apk                           
+php83-xmlreader                      8.3.8-r0                         apk                           
+php83-xmlwriter                      8.3.8-r0                         apk                           
+php83-zip                            8.3.8-r0                         apk                           
 phpseclib/phpseclib                  2.0.47                           php-composer                  
 pimple/pimple                        v3.5.0                           php-composer                  
-pixman                               0.42.2-r2                        apk                           
-pkgconf                              2.1.0-r0                         apk                           
 popt                                 1.19-r3                          apk                           
 ppv-lite86                           0.2.17                           rust-crate                    
 privacy                              1.13.0                           npm                           
@@ -426,7 +407,6 @@ serde                                1.0.163                          rust-crate
 serde_derive                         1.0.163                          rust-crate                    
 shaderc                              2023.7-r0                        apk                           
 shadow                               4.14.2-r0                        apk                           
-shared-mime-info                     2.4-r0                           apk                           
 signal-hook                          0.3.15                           rust-crate                    
 signal-hook-registry                 1.4.1                            rust-crate                    
 simd_helpers                         0.1.0                            rust-crate                    
@@ -439,7 +419,7 @@ spomky-labs/base64url                v2.0.4                           php-compos
 spomky-labs/cbor-php                 v2.0.1                           php-composer                  
 sqlite-libs                          3.44.2-r0                        apk                           
 sratom                               0.6.16-r0                        apk                           
-ssl_client                           1.36.1-r15                       apk                           
+ssl_client                           1.36.1-r18                       apk                           
 stecman/symfony-console-completion   0.11.0                           php-composer                  
 sudo                                 1.9.15_p2-r0                     apk                           
 support                              1.12.0                           npm                           
@@ -481,7 +461,6 @@ tevent                               0.15.0-r0                        apk
 thecodingmachine/safe                v1.3.3                           php-composer                  
 thiserror                            1.0.40                           rust-crate                    
 thiserror-impl                       1.0.40                           rust-crate                    
-tiff                                 4.6.0-r0                         apk                           
 twofactor_totp                       11.0.0-dev                       npm                           
 tzdata                               2024a-r0                         apk                           
 unicode-ident                        1.0.8                            rust-crate                    
@@ -52,8 +52,6 @@ app_setup_block_enabled: true
 app_setup_block: |
  Access the webui at `https://<your-ip>:443`, for more information check out [Nextcloud]({{ project_url }}).

-  Note: `occ` should be run without prepending with `sudo -u abc php` or `sudo -u www-data php` ie; `docker exec -it nextcloud occ maintenance:mode --off`
-
  ### Updating Nextcloud

  Updating Nextcloud is done by pulling the new image, and recreating the container with it.
@@ -68,34 +66,6 @@ app_setup_block: |

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

-  ### HEIC Image Previews
-
-  In order to enable HEIC image preview generation you will need to add the following to your `config.php` file in your `config/www/nextcloud/config' directory;
-
-  ```
-    'enable_previews' => true,
-    'enabledPreviewProviders' =>
-    array (
-      'OC\Preview\PNG',
-      'OC\Preview\JPEG',
-      'OC\Preview\GIF',
-      'OC\Preview\BMP',
-      'OC\Preview\XBitmap',
-      'OC\Preview\MP3',
-      'OC\Preview\TXT',
-      'OC\Preview\MarkDown',
-      'OC\Preview\OpenDocument',
-      'OC\Preview\Krita',
-      'OC\Preview\HEIC',
-    ),
-  ```
-
-  You may need to log out and back in for the changes to come in to effect. 
-  
-  This fix was sourced from [Nextcloud Documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#enabledpreviewproviders)
-
-  Nextcloud state that HEIC preview is disabled by default due to performance or privacy concerns, so enable this at your own risk. 
-
  ### Custom App Directories

  If you are [using custom app directories](https://docs.nextcloud.com/server/latest/admin_manual/apps_management.html#using-custom-app-directories) you will need to make the custom folder(s) you are using available to the web server. The recommended way to do this with our container is to add a volume. Ex:
@@ -109,10 +79,6 @@ app_setup_block: |

 # changelog
 changelogs:
-  - { date: "10.04.24:", desc: "Added imagemagick-pdf."}
-  - { date: "05.04.24:", desc: "Added imagemagick-heic. Manual update to `config.php` required - see above."}
-  - { date: "02.04.24:", desc: "Existing users should update: site-confs/default.conf - Add support for the Client Push (notify_push) plugin and the [new mod](https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push)."}
-  - { date: "22.03.24:", desc: "Add imagemagick-svg module."}
  - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
  - { date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
  - { date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types." }
@@ -1,4 +1,4 @@
-## Version 2024/04/02 - 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 {
@@ -156,14 +156,6 @@ server {
        return 301 /remote.php$request_uri;
    }

-    # Support for the Client Push (notify_push) plugin, needs mod installed https://github.com/linuxserver/docker-mods/tree/nextcloud-notify-push
-    location ^~ /push/ {
-        proxy_pass http://127.0.0.1:7867/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-    }
-
    location / {
        # enable for basic auth
        #auth_basic "Restricted";
Author	SHA1	Message	Date
LinuxServer-CI	dbe99cc569	Bot Updating Package Versions	2024-06-17 21:34:18 +00:00
LinuxServer-CI	abba10c24c	Bot Updating Package Versions	2024-06-11 11:50:49 +00:00
LinuxServer-CI	4513213b97	Bot Updating Package Versions	2024-06-04 11:50:59 +00:00
LinuxServer-CI	e25462f5d6	Bot Updating Package Versions	2024-05-28 11:52:42 +00:00
LinuxServer-CI	93c0ad7d37	Bot Updating Templated Files	2024-05-21 11:51:56 +00:00
LinuxServer-CI	c2921714b2	Bot Updating Templated Files	2024-05-21 11:49:39 +00:00
LinuxServer-CI	e4147b179b	Bot Updating Package Versions	2024-05-18 08:36:32 +00:00
LinuxServer-CI	6838676b53	Bot Updating Package Versions	2024-05-14 11:53:21 +00:00
LinuxServer-CI	2687e98212	Bot Updating Templated Files	2024-05-14 11:48:35 +00:00
LinuxServer-CI	419c882f73	Bot Updating Package Versions	2024-05-07 11:53:07 +00:00
LinuxServer-CI	e5f9510fed	Bot Updating Templated Files	2024-05-07 11:48:40 +00:00
LinuxServer-CI	222b58c99c	Bot Updating Package Versions	2024-04-30 11:56:53 +00:00
LinuxServer-CI	e355bcbe6a	Bot Updating Templated Files	2024-04-30 11:48:41 +00:00
LinuxServer-CI	4f00b831d3	Bot Updating Package Versions	2024-04-23 11:50:13 +00:00
LinuxServer-CI	7a8248f3cd	Bot Updating Package Versions	2024-04-16 11:50:06 +00:00
LinuxServer-CI	915ab07cd9	Bot Updating Package Versions	2024-04-08 13:35:02 +00:00
LinuxServer-CI	afb828d4da	Bot Updating Package Versions	2024-04-02 11:50:18 +00:00
LinuxServer-CI	f7056138b6	Bot Updating Package Versions	2024-03-26 11:53:11 +00:00
LinuxServer-CI	70f6155bbf	Bot Updating Package Versions	2024-03-21 21:33:06 +00:00
LinuxServer-CI	b9cf966878	Bot Updating Package Versions	2024-03-19 11:52:47 +00:00
LinuxServer-CI	dead6f366e	Bot Updating Package Versions	2024-03-14 21:33:06 +00:00
LinuxServer-CI	c2c4010ffb	Bot Updating Templated Files	2024-03-12 20:31:37 +00:00
LinuxServer-CI	150c587dff	Bot Updating Package Versions	2024-03-07 22:34:05 +00:00
LinuxServer-CI	671cf6fe6c	Bot Updating Package Versions	2024-03-06 18:32:28 +00:00
LinuxServer-CI	a7da03b8d8	Bot Updating Templated Files	2024-03-06 18:25:39 +00:00
Eric Nemchik	7c8251110c	Rebase to Alpine 3.19 (#399 ) * Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com> * update date and edge repo --------- Signed-off-by: Eric Nemchik <eric@nemchik.com> Co-authored-by: aptalca <541623+aptalca@users.noreply.github.com>	2024-03-06 13:24:01 -05:00
LinuxServer-CI	11824dbfe3	Bot Updating Package Versions	2024-03-05 11:50:19 +00:00
LinuxServer-CI	0004b51af8	Bot Updating Package Versions	2024-02-27 11:57:52 +00:00
LinuxServer-CI	9706c0481a	Bot Updating Templated Files	2024-02-27 11:50:16 +00:00
LinuxServer-CI	bcf04398d0	Bot Updating Templated Files	2024-02-27 11:48:43 +00:00
LinuxServer-CI	48667a56dd	Bot Updating Package Versions	2024-02-16 14:34:20 +00:00
LinuxServer-CI	b906641f24	Bot Updating Package Versions	2024-02-13 11:52:12 +00:00
LinuxServer-CI	9e83ba52fc	Bot Updating Package Versions	2024-02-06 11:49:42 +00:00
LinuxServer-CI	0dfd84df5c	Bot Updating Package Versions	2024-01-29 15:37:30 +00:00
LinuxServer-CI	231f432f80	Bot Updating Package Versions	2024-01-23 10:40:44 +00:00
LinuxServer-CI	c15658c110	Bot Updating Package Versions	2024-01-18 17:36:47 +00:00
LinuxServer-CI	388fc6d47a	Bot Updating Package Versions	2024-01-16 11:56:53 +00:00
LinuxServer-CI	2fe50c2f12	Bot Updating Templated Files	2024-01-16 11:50:34 +00:00
LinuxServer-CI	21dde133fd	Bot Updating Templated Files	2024-01-16 11:48:58 +00:00
LinuxServer-CI	7bed73efff	Bot Updating Package Versions	2024-01-09 11:50:08 +00:00
driz	aede8706ae	Merge pull request #406 from linuxserver/dev-mime-fix Merge pull request #405 from linuxserver/conf-fix-test	2024-01-03 20:55:16 -05:00
Eric Nemchik	ccb0036a96	Merge pull request #405 from linuxserver/conf-fix-test maybe fix nextcloud?	2024-01-03 23:48:00 +00:00
LinuxServer-CI	6675775f5c	Bot Updating Templated Files	2024-01-02 16:12:23 +00:00
Eric Nemchik	9d7ea19a71	Merge pull request #404 from linuxserver/cleanup-nginx-develop Cleanup default site conf	2024-01-02 10:10:21 -06:00
Eric Nemchik	7a4dc0aa13	Update readme date Signed-off-by: GitHub <noreply@github.com>	2024-01-02 16:07:05 +00:00
Eric Nemchik	56461a34b3	Cleanup default site conf Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-02 16:05:58 +00:00
LinuxServer-CI	f131871e4c	Bot Updating Package Versions	2024-01-02 11:49:44 +00:00
Adam	aae9593ea7	Merge pull request #396 from linuxserver/develop-mime Avoid duplicate mime definition	2023-12-22 22:39:46 +00:00
TheSpad	4178035a55	Consistent formatting	2023-12-22 17:16:22 +00:00
TheSpad	0ad8c52d56	Use text/javascript as per rfc9239	2023-12-22 17:15:18 +00:00
TheSpad	37eb7522e1	Prefer application/javascript	2023-12-22 17:08:14 +00:00
TheSpad	794f71483a	Avoid duplicate mime definition	2023-12-22 17:01:35 +00:00
LinuxServer-CI	b22dc7887a	Bot Updating Package Versions	2023-12-22 16:33:56 +00:00
Adam	408d92a2ec	Merge pull request #393 from linuxserver/develop-conf-mjs sync with upstream nextcloud docs	2023-12-22 16:28:28 +00:00
TheSpad	c3c64ae5d5	sync with upstream nextcloud docs	2023-12-22 16:03:20 +00:00
LinuxServer-CI	bf1947d7ad	Bot Updating Package Versions	2023-12-12 11:50:00 +00:00
LinuxServer-CI	94fd873ece	Bot Updating Package Versions	2023-12-07 21:34:08 +00:00
LinuxServer-CI	61f34bacdc	Bot Updating Package Versions	2023-12-05 11:50:04 +00:00
LinuxServer-CI	21f2fc0840	Bot Updating Package Versions	2023-11-30 21:34:34 +00:00
Eric Nemchik	2bdf249bf1	Merge pull request #383 from linuxserver/quiet-migration-develop only run migration if conf exists	2023-11-29 08:30:52 -06:00
LinuxServer-CI	e2d34baa3f	Bot Updating Package Versions	2023-11-28 11:52:19 +00:00
Eric Nemchik	be9ffb890e	only run migration if conf exists redirect stderr to /dev/null Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-25 10:49:42 -06:00
LinuxServer-CI	f62cc3b9e8	Bot Updating Package Versions	2023-11-21 11:49:54 +00:00
Eric Nemchik	45d68d0508	Merge pull request #357 from linuxserver/standard-cron-develop standard cron develop	2023-11-18 19:09:15 -06:00
LinuxServer-CI	ba1ac62fd9	Bot Updating Package Versions	2023-11-16 21:36:06 +00:00
LinuxServer-CI	ca6afd353a	Bot Updating Templated Files	2023-11-16 21:31:08 +00:00
LinuxServer-CI	acb431bc9c	Bot Updating Package Versions	2023-11-14 23:32:43 +00:00
LinuxServer-CI	2639cc28cd	Bot Updating Package Versions	2023-11-14 11:49:59 +00:00
LinuxServer-CI	35919306ae	Bot Updating Package Versions	2023-11-10 14:35:17 +00:00
LinuxServer-CI	355c1b33c1	Bot Updating Package Versions	2023-11-02 16:40:23 +00:00
LinuxServer-CI	5bb6b49068	Bot Updating Package Versions	2023-10-28 19:59:43 +00:00
LinuxServer-CI	96ae53f2fc	Bot Updating Templated Files	2023-10-28 19:54:46 +00:00
Eric Nemchik	9755ecbbc5	Merge pull request #376 from linuxserver/disable-web-upgrade-develop Disable web upgrades using occ during init develop	2023-10-28 14:53:12 -05:00
Eric Nemchik	e07f1ae896	Disable web upgrades using occ during init Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-10-28 14:25:07 -05:00
LinuxServer-CI	a810a8f45f	Bot Updating Package Versions	2023-10-24 11:52:50 +00:00
LinuxServer-CI	4f772f8a0e	Bot Updating Package Versions	2023-10-17 11:50:15 +00:00
LinuxServer-CI	eb988dcf54	Bot Updating Package Versions	2023-10-12 21:34:51 +00:00
LinuxServer-CI	c8441d7681	Bot Updating Package Versions	2023-10-10 11:54:28 +00:00
LinuxServer-CI	3caf64eb7e	Bot Updating Templated Files	2023-10-10 11:50:24 +00:00
LinuxServer-CI	49474850dc	Bot Updating Templated Files	2023-10-10 11:48:50 +00:00
LinuxServer-CI	373ee2efc0	Bot Updating Package Versions	2023-09-29 00:41:10 +00:00
Eric Nemchik	56ae57320b	Merge pull request #359 from linuxserver/develop-updatenotification-app Re-add updatenotification app	2023-09-28 19:36:15 -05:00
LinuxServer-CI	26c0913d86	Bot Updating Package Versions	2023-09-28 14:38:09 +00:00
LinuxServer-CI	525efaa99a	Bot Updating Package Versions	2023-09-26 11:50:04 +00:00
quietsy	50c57a68f9	Merge pull request #365 from linuxserver/fix-lsiown-develop Fix lsiown -R order	2023-09-18 16:57:26 +03:00
quietsy	a1a8f070f1	Fix lsiown -R order	2023-09-18 16:39:12 +03:00
LinuxServer-CI	9f953af7ad	Bot Updating Package Versions	2023-09-14 18:33:10 +00:00
LinuxServer-CI	4d74174b8c	Bot Updating Package Versions	2023-09-12 09:35:12 +00:00
LinuxServer-CI	db66b6a2cc	Bot Updating Package Versions	2023-09-07 14:33:34 +00:00
LinuxServer-CI	92378267ac	Bot Updating Package Versions	2023-09-05 11:50:04 +00:00
LinuxServer-CI	7f08b006fe	Bot Updating Package Versions	2023-08-31 15:33:10 +00:00
Eric Nemchik	cea5b826cc	Re-add updatenotification app Closes https://github.com/linuxserver/docker-nextcloud/issues/356 Signed-off-by: GitHub <noreply@github.com>	2023-08-31 14:00:49 +00:00
LinuxServer-CI	e7cdf18d23	Bot Updating Package Versions	2023-08-29 11:51:13 +00:00
Eric Nemchik	74f9122ab6	Merge branch 'standard-cron' into standard-cron-develop	2023-08-26 09:59:51 -05:00
LinuxServer-CI	d935187cb3	Bot Updating Package Versions	2023-08-22 11:50:11 +00:00
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